[Buildroot] [git commit] package/re2: propagate libabseil-cpp dependencies
Thomas Petazzoni
thomas.petazzoni at bootlin.com
Wed Feb 7 11:44:04 UTC 2024
commit: https://git.buildroot.net/buildroot/commit/?id=4f7f0565699b5f396b918954c3c7a91a7ede16b0
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Commit fc7606010e4edde7a34c545fac0fe7f82d4a5e18 forgot to propagate
libabseil-cpp dependencies to re2
Fixes:
- No autobuilder failures (yet)
Signed-off-by: Fabrice Fontaine <fontaine.fabrice at gmail.com>
Reviewed-by: Michael Nosthoff <buildroot at heine.tech>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni at bootlin.com>
---
package/grpc/Config.in | 2 +-
package/qt5/qt5webengine/Config.in | 6 ++++--
package/re2/Config.in | 7 +++++--
3 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/package/grpc/Config.in b/package/grpc/Config.in
index ef3e1c86cb..7664948b40 100644
--- a/package/grpc/Config.in
+++ b/package/grpc/Config.in
@@ -4,7 +4,7 @@ config BR2_PACKAGE_GRPC
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, re2
- depends on !BR2_STATIC_LIBS # protobuf, libabseil-cpp
+ depends on !BR2_STATIC_LIBS # protobuf, libabseil-cpp, re2
depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_ATOMIC
depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS
select BR2_PACKAGE_C_ARES
diff --git a/package/qt5/qt5webengine/Config.in b/package/qt5/qt5webengine/Config.in
index cfa5893f41..99a2980a25 100644
--- a/package/qt5/qt5webengine/Config.in
+++ b/package/qt5/qt5webengine/Config.in
@@ -9,12 +9,13 @@ config BR2_PACKAGE_QT5WEBENGINE_ARCH_SUPPORTS
depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE # qt5declarative
depends on !BR2_BINFMT_FLAT # qt5base-icu
depends on BR2_USE_MMU # libglib2, qt5base-dbus
+ depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS # re2
-comment "qt5webengine needs udev /dev management and a glibc toolchain w/ gcc >= 8, host gcc >= 4.9, threads, wchar"
+comment "qt5webengine needs udev /dev management and a glibc toolchain w/ gcc >= 8, host gcc >= 4.9, dynamic library, threads, wchar"
depends on BR2_PACKAGE_QT5WEBENGINE_ARCH_SUPPORTS
depends on !BR2_PACKAGE_HAS_UDEV || !BR2_TOOLCHAIN_USES_GLIBC || \
!BR2_TOOLCHAIN_GCC_AT_LEAST_8 || \
- !BR2_HOST_GCC_AT_LEAST_4_9 || \
+ !BR2_HOST_GCC_AT_LEAST_4_9 || BR2_STATIC_LIBS || \
!BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR
comment "qt5webengine needs an OpenGL and EGL-capable backend"
@@ -24,6 +25,7 @@ comment "qt5webengine needs an OpenGL and EGL-capable backend"
config BR2_PACKAGE_QT5WEBENGINE
bool "qt5webengine"
depends on BR2_PACKAGE_QT5WEBENGINE_ARCH_SUPPORTS
+ depends on !BR2_STATIC_LIBS # re2
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_8 # re2
diff --git a/package/re2/Config.in b/package/re2/Config.in
index 0ac0041f6d..b79e711ad3 100644
--- a/package/re2/Config.in
+++ b/package/re2/Config.in
@@ -1,8 +1,10 @@
config BR2_PACKAGE_RE2
bool "re2"
+ depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS
depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # C++14
depends on BR2_TOOLCHAIN_HAS_THREADS
+ depends on !BR2_STATIC_LIBS # libabseil-cpp
select BR2_PACKAGE_LIBABSEIL_CPP
help
RE2 is a fast, safe, thread-friendly alternative
@@ -12,7 +14,8 @@ config BR2_PACKAGE_RE2
https://github.com/google/re2
-comment "re2 needs a toolchain w/ C++, threads, gcc >= 8"
+comment "re2 needs a toolchain w/ C++, threads, dynamic library, gcc >= 8"
+ depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS
depends on !BR2_INSTALL_LIBSTDCPP || \
!BR2_TOOLCHAIN_HAS_THREADS || \
- !BR2_TOOLCHAIN_GCC_AT_LEAST_8
+ BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_8
More information about the buildroot
mailing list