Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH v3] package/re2: bump to version 2023.11.01
@ 2023-11-27 10:14 Michael Nosthoff via buildroot
  2023-11-27 18:35 ` Yann E. MORIN
  0 siblings, 1 reply; 2+ messages in thread
From: Michael Nosthoff via buildroot @ 2023-11-27 10:14 UTC (permalink / raw)
  To: buildroot; +Cc: Giulio Benetti, Julien Corjon, Robert Rose

- libabseil-cpp is now a dependency
- required c++ standard is now c++14 [0] --> requires gcc8
- drop fix for gcc <= 5 introduced in 25fd3b0a523805db14682f7c559cc1c9c366ed55
  (c++ >= 14 is the default for gcc >= 8)
- update gcc required for depending packages qt5webengine & grpc

[0] https://github.com/google/re2/wiki/Install/7c2552dd54444695ce5a9e6a01dd8f312b347914

Signed-off-by: Michael Nosthoff <buildroot@heine.tech>
---

v2:
 - clarify that re2 itself now requires c++14
 - raise gcc required version for qt5webengine and add comment for grpc

v3:
 - update C++14 comment in Config.in
---
 package/grpc/Config.in             |  2 +-
 package/qt5/qt5webengine/Config.in |  6 +++---
 package/re2/Config.in              |  7 ++++---
 package/re2/re2.hash               |  2 +-
 package/re2/re2.mk                 | 13 +++++--------
 5 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/package/grpc/Config.in b/package/grpc/Config.in
index afe0ea8450..ef3e1c86cb 100644
--- a/package/grpc/Config.in
+++ b/package/grpc/Config.in
@@ -3,7 +3,7 @@ config BR2_PACKAGE_GRPC
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_TOOLCHAIN_HAS_THREADS # protobuf, re2
 	depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # protobuf
-	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # libabseil-cpp
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # libabseil-cpp, re2
 	depends on !BR2_STATIC_LIBS # protobuf, libabseil-cpp
 	depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_ATOMIC
 	depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS
diff --git a/package/qt5/qt5webengine/Config.in b/package/qt5/qt5webengine/Config.in
index 542f212dfc..cfa5893f41 100644
--- a/package/qt5/qt5webengine/Config.in
+++ b/package/qt5/qt5webengine/Config.in
@@ -10,10 +10,10 @@ config BR2_PACKAGE_QT5WEBENGINE_ARCH_SUPPORTS
 	depends on !BR2_BINFMT_FLAT # qt5base-icu
 	depends on BR2_USE_MMU # libglib2, qt5base-dbus
 
-comment "qt5webengine needs udev /dev management and a glibc toolchain w/ gcc >= 4.9, host gcc >= 4.9, threads, wchar"
+comment "qt5webengine needs udev /dev management and a glibc toolchain w/ gcc >= 8, host gcc >= 4.9, threads, wchar"
 	depends on BR2_PACKAGE_QT5WEBENGINE_ARCH_SUPPORTS
 	depends on !BR2_PACKAGE_HAS_UDEV || !BR2_TOOLCHAIN_USES_GLIBC || \
-		!BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \
+		!BR2_TOOLCHAIN_GCC_AT_LEAST_8 || \
 		!BR2_HOST_GCC_AT_LEAST_4_9 || \
 		!BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR
 
@@ -26,7 +26,7 @@ config BR2_PACKAGE_QT5WEBENGINE
 	depends on BR2_PACKAGE_QT5WEBENGINE_ARCH_SUPPORTS
 	depends on BR2_TOOLCHAIN_USES_GLIBC # execinfo.h, mallinfo
 	depends on BR2_HOST_GCC_AT_LEAST_4_9 # qt5base-icu
-	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # qt5base-icu
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # re2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2, libvpx, qt5base-dbus
 	depends on BR2_USE_WCHAR # libglib2
 	depends on BR2_PACKAGE_QT5_GL_AVAILABLE # qt5declarative, qt5base-eglfs
diff --git a/package/re2/Config.in b/package/re2/Config.in
index 64217e8aa2..0ac0041f6d 100644
--- a/package/re2/Config.in
+++ b/package/re2/Config.in
@@ -1,8 +1,9 @@
 config BR2_PACKAGE_RE2
 	bool "re2"
 	depends on BR2_INSTALL_LIBSTDCPP
-	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # needs C++11
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # C++14
 	depends on BR2_TOOLCHAIN_HAS_THREADS
+	select BR2_PACKAGE_LIBABSEIL_CPP
 	help
 	  RE2 is a fast, safe, thread-friendly alternative
 	  to backtracking regular expression engines like
@@ -11,7 +12,7 @@ config BR2_PACKAGE_RE2
 
 	  https://github.com/google/re2
 
-comment "re2 needs a toolchain w/ C++, threads, gcc >= 4.8"
+comment "re2 needs a toolchain w/ C++, threads, gcc >= 8"
 	depends on !BR2_INSTALL_LIBSTDCPP || \
 		!BR2_TOOLCHAIN_HAS_THREADS || \
-		!BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
+		!BR2_TOOLCHAIN_GCC_AT_LEAST_8
diff --git a/package/re2/re2.hash b/package/re2/re2.hash
index a39dece7a9..5f590aba6e 100644
--- a/package/re2/re2.hash
+++ b/package/re2/re2.hash
@@ -1,3 +1,3 @@
 # locally calculated
-sha256  cbce8b7803e856827201a132862e41af386e7afd9cc6d9a9bc7a4fa4d8ddbdde  re2-2023-02-01.tar.gz
+sha256  4e6593ac3c71de1c0f322735bc8b0492a72f66ffccfad76e259fa21c41d27d8a  re2-2023-11-01.tar.gz
 sha256  6040cda75d90b1738292a631d89934c411ef7ffd543c4d6a1b7edfc8edf29449  LICENSE
diff --git a/package/re2/re2.mk b/package/re2/re2.mk
index 5587366b1f..b81a64f2e9 100644
--- a/package/re2/re2.mk
+++ b/package/re2/re2.mk
@@ -4,29 +4,26 @@
 #
 ################################################################################
 
-RE2_VERSION = 2023-02-01
+RE2_VERSION = 2023-11-01
 RE2_SITE = $(call github,google,re2,$(RE2_VERSION))
 RE2_LICENSE = BSD-3-Clause
 RE2_LICENSE_FILES = LICENSE
 RE2_INSTALL_STAGING = YES
-
-RE2_MAKE_OPTS = \
-	$(TARGET_CONFIGURE_OPTS) \
-	CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11"
+RE2_DEPENDENCIES = libabseil-cpp
 
 define RE2_BUILD_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) $(RE2_MAKE_OPTS) \
+	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
 		-C $(@D) $(if $(BR2_STATIC_LIBS),static)
 endef
 
 define RE2_INSTALL_STAGING_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) $(RE2_MAKE_OPTS) \
+	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
 		DESTDIR="$(STAGING_DIR)" prefix=/usr -C $(@D) \
 		$(if $(BR2_STATIC_LIBS),static-install,install)
 endef
 
 define RE2_INSTALL_TARGET_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) $(RE2_MAKE_OPTS) \
+	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
 		DESTDIR="$(TARGET_DIR)" prefix=/usr -C $(@D) \
 		$(if $(BR2_STATIC_LIBS),static-install,install)
 endef
-- 
2.34.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 2+ messages in thread
* Re: [Buildroot] [PATCH v3] package/re2: bump to version 2023.11.01
  2023-11-27 10:14 [Buildroot] [PATCH v3] package/re2: bump to version 2023.11.01 Michael Nosthoff via buildroot
@ 2023-11-27 18:35 ` Yann E. MORIN
  0 siblings, 0 replies; 2+ messages in thread
From: Yann E. MORIN @ 2023-11-27 18:35 UTC (permalink / raw)
  To: Michael Nosthoff; +Cc: Giulio Benetti, Robert Rose, Julien Corjon, buildroot

Michael, All,

On 2023-11-27 11:14 +0100, Michael Nosthoff via buildroot spake thusly:
> - libabseil-cpp is now a dependency
> - required c++ standard is now c++14 [0] --> requires gcc8
> - drop fix for gcc <= 5 introduced in 25fd3b0a523805db14682f7c559cc1c9c366ed55
>   (c++ >= 14 is the default for gcc >= 8)
> - update gcc required for depending packages qt5webengine & grpc
> 
> [0] https://github.com/google/re2/wiki/Install/7c2552dd54444695ce5a9e6a01dd8f312b347914
> 
> Signed-off-by: Michael Nosthoff <buildroot@heine.tech>

Applied to next, thanks.

Regards,
Yann E. MORIN.

> ---
> 
> v2:
>  - clarify that re2 itself now requires c++14
>  - raise gcc required version for qt5webengine and add comment for grpc
> 
> v3:
>  - update C++14 comment in Config.in
> ---
>  package/grpc/Config.in             |  2 +-
>  package/qt5/qt5webengine/Config.in |  6 +++---
>  package/re2/Config.in              |  7 ++++---
>  package/re2/re2.hash               |  2 +-
>  package/re2/re2.mk                 | 13 +++++--------
>  5 files changed, 14 insertions(+), 16 deletions(-)
> 
> diff --git a/package/grpc/Config.in b/package/grpc/Config.in
> index afe0ea8450..ef3e1c86cb 100644
> --- a/package/grpc/Config.in
> +++ b/package/grpc/Config.in
> @@ -3,7 +3,7 @@ config BR2_PACKAGE_GRPC
>  	depends on BR2_INSTALL_LIBSTDCPP
>  	depends on BR2_TOOLCHAIN_HAS_THREADS # protobuf, re2
>  	depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # protobuf
> -	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # libabseil-cpp
> +	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # libabseil-cpp, re2
>  	depends on !BR2_STATIC_LIBS # protobuf, libabseil-cpp
>  	depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_ATOMIC
>  	depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS
> diff --git a/package/qt5/qt5webengine/Config.in b/package/qt5/qt5webengine/Config.in
> index 542f212dfc..cfa5893f41 100644
> --- a/package/qt5/qt5webengine/Config.in
> +++ b/package/qt5/qt5webengine/Config.in
> @@ -10,10 +10,10 @@ config BR2_PACKAGE_QT5WEBENGINE_ARCH_SUPPORTS
>  	depends on !BR2_BINFMT_FLAT # qt5base-icu
>  	depends on BR2_USE_MMU # libglib2, qt5base-dbus
>  
> -comment "qt5webengine needs udev /dev management and a glibc toolchain w/ gcc >= 4.9, host gcc >= 4.9, threads, wchar"
> +comment "qt5webengine needs udev /dev management and a glibc toolchain w/ gcc >= 8, host gcc >= 4.9, threads, wchar"
>  	depends on BR2_PACKAGE_QT5WEBENGINE_ARCH_SUPPORTS
>  	depends on !BR2_PACKAGE_HAS_UDEV || !BR2_TOOLCHAIN_USES_GLIBC || \
> -		!BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \
> +		!BR2_TOOLCHAIN_GCC_AT_LEAST_8 || \
>  		!BR2_HOST_GCC_AT_LEAST_4_9 || \
>  		!BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR
>  
> @@ -26,7 +26,7 @@ config BR2_PACKAGE_QT5WEBENGINE
>  	depends on BR2_PACKAGE_QT5WEBENGINE_ARCH_SUPPORTS
>  	depends on BR2_TOOLCHAIN_USES_GLIBC # execinfo.h, mallinfo
>  	depends on BR2_HOST_GCC_AT_LEAST_4_9 # qt5base-icu
> -	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # qt5base-icu
> +	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # re2
>  	depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2, libvpx, qt5base-dbus
>  	depends on BR2_USE_WCHAR # libglib2
>  	depends on BR2_PACKAGE_QT5_GL_AVAILABLE # qt5declarative, qt5base-eglfs
> diff --git a/package/re2/Config.in b/package/re2/Config.in
> index 64217e8aa2..0ac0041f6d 100644
> --- a/package/re2/Config.in
> +++ b/package/re2/Config.in
> @@ -1,8 +1,9 @@
>  config BR2_PACKAGE_RE2
>  	bool "re2"
>  	depends on BR2_INSTALL_LIBSTDCPP
> -	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # needs C++11
> +	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # C++14
>  	depends on BR2_TOOLCHAIN_HAS_THREADS
> +	select BR2_PACKAGE_LIBABSEIL_CPP
>  	help
>  	  RE2 is a fast, safe, thread-friendly alternative
>  	  to backtracking regular expression engines like
> @@ -11,7 +12,7 @@ config BR2_PACKAGE_RE2
>  
>  	  https://github.com/google/re2
>  
> -comment "re2 needs a toolchain w/ C++, threads, gcc >= 4.8"
> +comment "re2 needs a toolchain w/ C++, threads, gcc >= 8"
>  	depends on !BR2_INSTALL_LIBSTDCPP || \
>  		!BR2_TOOLCHAIN_HAS_THREADS || \
> -		!BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
> +		!BR2_TOOLCHAIN_GCC_AT_LEAST_8
> diff --git a/package/re2/re2.hash b/package/re2/re2.hash
> index a39dece7a9..5f590aba6e 100644
> --- a/package/re2/re2.hash
> +++ b/package/re2/re2.hash
> @@ -1,3 +1,3 @@
>  # locally calculated
> -sha256  cbce8b7803e856827201a132862e41af386e7afd9cc6d9a9bc7a4fa4d8ddbdde  re2-2023-02-01.tar.gz
> +sha256  4e6593ac3c71de1c0f322735bc8b0492a72f66ffccfad76e259fa21c41d27d8a  re2-2023-11-01.tar.gz
>  sha256  6040cda75d90b1738292a631d89934c411ef7ffd543c4d6a1b7edfc8edf29449  LICENSE
> diff --git a/package/re2/re2.mk b/package/re2/re2.mk
> index 5587366b1f..b81a64f2e9 100644
> --- a/package/re2/re2.mk
> +++ b/package/re2/re2.mk
> @@ -4,29 +4,26 @@
>  #
>  ################################################################################
>  
> -RE2_VERSION = 2023-02-01
> +RE2_VERSION = 2023-11-01
>  RE2_SITE = $(call github,google,re2,$(RE2_VERSION))
>  RE2_LICENSE = BSD-3-Clause
>  RE2_LICENSE_FILES = LICENSE
>  RE2_INSTALL_STAGING = YES
> -
> -RE2_MAKE_OPTS = \
> -	$(TARGET_CONFIGURE_OPTS) \
> -	CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11"
> +RE2_DEPENDENCIES = libabseil-cpp
>  
>  define RE2_BUILD_CMDS
> -	$(TARGET_MAKE_ENV) $(MAKE) $(RE2_MAKE_OPTS) \
> +	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
>  		-C $(@D) $(if $(BR2_STATIC_LIBS),static)
>  endef
>  
>  define RE2_INSTALL_STAGING_CMDS
> -	$(TARGET_MAKE_ENV) $(MAKE) $(RE2_MAKE_OPTS) \
> +	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
>  		DESTDIR="$(STAGING_DIR)" prefix=/usr -C $(@D) \
>  		$(if $(BR2_STATIC_LIBS),static-install,install)
>  endef
>  
>  define RE2_INSTALL_TARGET_CMDS
> -	$(TARGET_MAKE_ENV) $(MAKE) $(RE2_MAKE_OPTS) \
> +	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
>  		DESTDIR="$(TARGET_DIR)" prefix=/usr -C $(@D) \
>  		$(if $(BR2_STATIC_LIBS),static-install,install)
>  endef
> -- 
> 2.34.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-11-27 18:35 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-11-27 10:14 [Buildroot] [PATCH v3] package/re2: bump to version 2023.11.01 Michael Nosthoff via buildroot
2023-11-27 18:35 ` Yann E. MORIN

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox