package/optee-client: add dependency on !BR2_STATIC_LIBS

Since OP-TEE client 3.13.0, <dlfcn.h> is unconditionally used, so we
need to add a !BR2_STATIC_LIBS dependency to optee-client and its
reverse dependencies.

Fixes:

  http://autobuild.buildroot.net/results/169cf630866cb84d711d68877bb83c897e1d2814/

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>

diff --git a/package/optee-benchmark/Config.in b/package/optee-benchmark/Config.in
index 5fd365a9e385f01b9af0e9ec603de3c60f40e029..0257392d3a890c98b5d11c7774171a1573ea9898 100644 (file)
--- a/package/optee-benchmark/Config.in
+++ b/package/optee-benchmark/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_OPTEE_BENCHMARK
        bool "optee-benchmark"
        depends on BR2_USE_MMU # fork()
        depends on BR2_TOOLCHAIN_HAS_THREADS # optee-client
+       depends on !BR2_STATIC_LIBS # optee-client
        select BR2_PACKAGE_OPTEE_CLIENT
        select BR2_PACKAGE_LIBYAML
        help
@@ -12,6 +13,6 @@ config BR2_PACKAGE_OPTEE_BENCHMARK
 
          http://github.com/linaro-swg/optee_benchmark
 
-comment "optee-benchmark needs a toolchain w/ threads"
+comment "optee-benchmark needs a toolchain w/ threads, dynamic library"
        depends on BR2_USE_MMU
-       depends on !BR2_TOOLCHAIN_HAS_THREADS
+       depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS

diff --git a/package/optee-client/Config.in b/package/optee-client/Config.in
index 1ef0a1401e2cef3ac4b6ea43538fc073b01895b4..d2fda18df80f9ccd77c26503f5912cbef3d8609d 100644 (file)
--- a/package/optee-client/Config.in
+++ b/package/optee-client/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_OPTEE_CLIENT
        bool "optee-client"
        depends on BR2_TOOLCHAIN_HAS_THREADS
+       depends on !BR2_STATIC_LIBS # dlfcn.h
        help
          Enable the OP-TEE client package that brings non-secure
          client application resources for OP-TEE support. OP-TEE
@@ -25,5 +26,5 @@ config BR2_PACKAGE_OPTEE_CLIENT_TEE_FS_PATH
 
 endif
 
-comment "optee-client needs a toolchain w/ threads"
-       depends on !BR2_TOOLCHAIN_HAS_THREADS
+comment "optee-client needs a toolchain w/ threads, dynamic library"
+       depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS

diff --git a/package/optee-examples/Config.in b/package/optee-examples/Config.in
index c0fecfdf500a63b5254911cc738f1c4180d0ca9d..859cd6632e90e99dd8b95d005c66e6b9b0395e50 100644 (file)
--- a/package/optee-examples/Config.in
+++ b/package/optee-examples/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_OPTEE_EXAMPLES
        bool "optee-examples"
        depends on BR2_TARGET_OPTEE_OS
        depends on BR2_TOOLCHAIN_HAS_THREADS # optee-client
+       depends on !BR2_STATIC_LIBS # optee-client
        select BR2_PACKAGE_OPTEE_CLIENT
        select BR2_TARGET_OPTEE_OS_SDK
        help
@@ -18,6 +19,6 @@ config BR2_PACKAGE_OPTEE_EXAMPLES
 
          https://github.com/linaro-swg/optee_examples
 
-comment "optee-examples needs a toolchain w/ threads"
+comment "optee-examples needs a toolchain w/ threads, dynamic library"
        depends on BR2_TARGET_OPTEE_OS
-       depends on !BR2_TOOLCHAIN_HAS_THREADS
+       depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS

diff --git a/package/optee-test/Config.in b/package/optee-test/Config.in
index 357a6b0c578b76335fb107b8428bbc9b2a438df7..5d23885f4565d682eb29e0a358ffead9fe85b78d 100644 (file)
--- a/package/optee-test/Config.in
+++ b/package/optee-test/Config.in
@@ -3,6 +3,7 @@ config BR2_PACKAGE_OPTEE_TEST
        depends on BR2_TARGET_OPTEE_OS
        depends on BR2_TOOLCHAIN_HAS_THREADS # optee-client
        depends on BR2_INSTALL_LIBSTDCPP
+       depends on !BR2_STATIC_LIBS # optee-client
        select BR2_PACKAGE_OPTEE_CLIENT
        select BR2_TARGET_OPTEE_OS_SDK
        help
@@ -25,4 +26,5 @@ config BR2_PACKAGE_OPTEE_TEST
 
 comment "optee-test needs a toolchain w/ threads and C++"
        depends on BR2_TARGET_OPTEE_OS
-       depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP
+       depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || \
+               BR2_STATIC_LIBS