From 321a850bc7347b1b40289ef5a79ca738d51c81c8 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 2 Aug 2021 21:59:27 +0200 Subject: [PATCH] package/optee-client: add dependency on !BR2_STATIC_LIBS Since OP-TEE client 3.13.0, 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 --- package/optee-benchmark/Config.in | 5 +++-- package/optee-client/Config.in | 5 +++-- package/optee-examples/Config.in | 5 +++-- package/optee-test/Config.in | 4 +++- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/package/optee-benchmark/Config.in b/package/optee-benchmark/Config.in index 5fd365a9e3..0257392d3a 100644 --- 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 1ef0a1401e..d2fda18df8 100644 --- 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 c0fecfdf50..859cd6632e 100644 --- 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 357a6b0c57..5d23885f45 100644 --- 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 -- 2.30.2