package/libabseil-cpp: depend on (host) gcc >= 4.9

abseil depends on gcc >= 4.9 according to [0] and actually doesn't
compile anymore with the latest version bump.
This didn't show in the autobuilders as the C++11 issue fixed in the
previous commit shadowed it.

also update dependency in package/grpc.

fixes:
 https://github.com/abseil/abseil-cpp/issues/795

[0] https://abseil.io/docs/cpp/platforms/platforms#linux

Signed-off-by: Michael Nosthoff <buildroot@heine.tech>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>

diff --git a/package/grpc/Config.in b/package/grpc/Config.in
index 0270b38c35bfcfaf664a98e7c1a0f30fd5281234..6151f4b3d1410ca9773cd923bef0f8f6e2547442 100644 (file)
--- a/package/grpc/Config.in
+++ b/package/grpc/Config.in
@@ -3,7 +3,8 @@ 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_4_8 # protobuf, re2
+       depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # protobuf, re2, libabseil-cpp
+       depends on BR2_HOST_GCC_AT_LEAST_4_9 # host-libabseil-cpp
        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
@@ -19,9 +20,10 @@ config BR2_PACKAGE_GRPC
 
          http://github.com/grpc/grpc
 
-comment "grpc needs a toolchain w/ C++, threads, dynamic library, gcc >= 4.8"
+comment "grpc needs a toolchain w/ C++, threads, dynamic library, gcc >= 4.9"
        depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS
        depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_ATOMIC
        depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS \
-               || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
+               || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 \
+               || !BR2_HOST_GCC_AT_LEAST_4_9
        depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS

diff --git a/package/libabseil-cpp/Config.in b/package/libabseil-cpp/Config.in
index 8018e7b2642b5b46e94f3218cdf804db1a3f3838..222e3a092a3fe81cd301931cdaebc6bdf54923db 100644 (file)
--- a/package/libabseil-cpp/Config.in
+++ b/package/libabseil-cpp/Config.in
@@ -14,6 +14,7 @@ config BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS
 config BR2_PACKAGE_LIBABSEIL_CPP
        bool "libabseil-cpp"
        depends on BR2_INSTALL_LIBSTDCPP
+       depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
        depends on BR2_TOOLCHAIN_HAS_THREADS
        depends on !BR2_STATIC_LIBS # uses dlfcn.h
        depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS
@@ -26,7 +27,7 @@ config BR2_PACKAGE_LIBABSEIL_CPP
 
          https://github.com/abseil/abseil-cpp
 
-comment "libabseil-cpp needs a toolchain w/ C++, threads, dynamic library"
+comment "libabseil-cpp needs a toolchain w/ gcc >= 4.9, C++, threads, dynamic library"
        depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS
        depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \
-               BR2_STATIC_LIBS
+               BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9