NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/optee-client: add dependency on !BR2_STATIC_LIBS

Browse Source 
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>
This commit is contained in:
Thomas Petazzoni 2021-08-02 21:59:27 +02:00
parent 814ebe83e7
commit 321a850bc7
4 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
package/optee-benchmark/Config.in
View File

@ -2,6 +2,7 @@ config BR2_PACKAGE_OPTEE_BENCHMARK
bool "optee-benchmark" bool "optee-benchmark"
depends on BR2_USE_MMU # fork() depends on BR2_USE_MMU # fork()
depends on BR2_TOOLCHAIN_HAS_THREADS # optee-client depends on BR2_TOOLCHAIN_HAS_THREADS # optee-client
depends on !BR2_STATIC_LIBS # optee-client
select BR2_PACKAGE_OPTEE_CLIENT select BR2_PACKAGE_OPTEE_CLIENT
select BR2_PACKAGE_LIBYAML select BR2_PACKAGE_LIBYAML
help help
@ -12,6 +13,6 @@ config BR2_PACKAGE_OPTEE_BENCHMARK
http://github.com/linaro-swg/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_USE_MMU
depends on !BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS

5
package/optee-client/Config.in
View File

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

5
package/optee-examples/Config.in
View File

@ -2,6 +2,7 @@ config BR2_PACKAGE_OPTEE_EXAMPLES
bool "optee-examples" bool "optee-examples"
depends on BR2_TARGET_OPTEE_OS depends on BR2_TARGET_OPTEE_OS
depends on BR2_TOOLCHAIN_HAS_THREADS # optee-client depends on BR2_TOOLCHAIN_HAS_THREADS # optee-client
depends on !BR2_STATIC_LIBS # optee-client
select BR2_PACKAGE_OPTEE_CLIENT select BR2_PACKAGE_OPTEE_CLIENT
select BR2_TARGET_OPTEE_OS_SDK select BR2_TARGET_OPTEE_OS_SDK
help help
@ -18,6 +19,6 @@ config BR2_PACKAGE_OPTEE_EXAMPLES
https://github.com/linaro-swg/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_TARGET_OPTEE_OS
depends on !BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS

4
package/optee-test/Config.in
View File

@ -3,6 +3,7 @@ config BR2_PACKAGE_OPTEE_TEST
depends on BR2_TARGET_OPTEE_OS depends on BR2_TARGET_OPTEE_OS
depends on BR2_TOOLCHAIN_HAS_THREADS # optee-client depends on BR2_TOOLCHAIN_HAS_THREADS # optee-client
depends on BR2_INSTALL_LIBSTDCPP depends on BR2_INSTALL_LIBSTDCPP
depends on !BR2_STATIC_LIBS # optee-client
select BR2_PACKAGE_OPTEE_CLIENT select BR2_PACKAGE_OPTEE_CLIENT
select BR2_TARGET_OPTEE_OS_SDK select BR2_TARGET_OPTEE_OS_SDK
help help
@ -25,4 +26,5 @@ config BR2_PACKAGE_OPTEE_TEST
comment "optee-test needs a toolchain w/ threads and C++" comment "optee-test needs a toolchain w/ threads and C++"
depends on BR2_TARGET_OPTEE_OS 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