aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Thomas Petazzoni <thomas.petazzoni@bootlin.com>2020-08-07 12:11:38 +0200
committerGravatar Thomas Petazzoni <thomas.petazzoni@bootlin.com>2020-08-07 12:12:21 +0200
commita68fb15dc61bb845e38ad8f4ef48249458701bb3 (patch)
tree59280f6f44b83c1fd3faf37ff908d579fec39360
parent35b014ab8b787e0e44b503fe945b2627dbe41f09 (diff)
downloadbuildroot-a68fb15dc61bb845e38ad8f4ef48249458701bb3.tar.gz
buildroot-a68fb15dc61bb845e38ad8f4ef48249458701bb3.tar.bz2
package/libabseil-cpp: needs dynamic library support
The libabseil-cpp build needs <dlfcn.h>, so let's add a !BR2_STATIC_LIBS dependency. The only package which is selecting libabseil-cpp, grpc, already had this dependency anyway. Fixes: http://autobuild.buildroot.net/results/2d796dd4cc43388da235b83f53778d902f477799/ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
-rw-r--r--package/grpc/Config.in2
-rw-r--r--package/libabseil-cpp/Config.in6
2 files changed, 5 insertions, 3 deletions
diff --git a/package/grpc/Config.in b/package/grpc/Config.in
index 45299888ea..43ccddbdaf 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
depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # protobuf
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # protobuf
- depends on !BR2_STATIC_LIBS # protobuf
+ depends on !BR2_STATIC_LIBS # protobuf, libabseil-cpp
depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_ATOMIC
select BR2_PACKAGE_C_ARES
select BR2_PACKAGE_LIBABSEIL_CPP
diff --git a/package/libabseil-cpp/Config.in b/package/libabseil-cpp/Config.in
index 38cb66d49f..7b1ca37917 100644
--- a/package/libabseil-cpp/Config.in
+++ b/package/libabseil-cpp/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_LIBABSEIL_CPP
bool "libabseil-cpp"
depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_TOOLCHAIN_HAS_THREADS
+ depends on !BR2_STATIC_LIBS # uses dlfcn.h
help
Abseil is an open-source collection of C++ library code
designed to augment the C++ standard library. The Abseil
@@ -11,5 +12,6 @@ config BR2_PACKAGE_LIBABSEIL_CPP
https://github.com/abseil/abseil-cpp
-comment "libabseil-cpp needs a toolchain w/ C++, threads"
- depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
+comment "libabseil-cpp needs a toolchain w/ C++, threads, dynamic library"
+ depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \
+ BR2_STATIC_LIBS