package/re2: propagate libabseil-cpp dependencies

Commit fc7606010e forgot to propagate
libabseil-cpp dependencies to re2

Fixes:
 - No autobuilder failures (yet)

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Reviewed-by: Michael Nosthoff <buildroot@heine.tech>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Fabrice Fontaine 2024-01-18 23:04:22 +01:00 committed by Thomas Petazzoni
parent 8a232ee101
commit 4f7f056569
3 changed files with 10 additions and 5 deletions

View File

@ -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

View File

@ -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

View File

@ -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