package/optee-*: support BR2_STATIC_LIBS=y
PATCH v2 1/1 package/optee-*: support BR2_STATIC_LIBS=y
Patch current optee-client 3.4.0 to support building resources with static linkage of executable binaries with the user libraries. The optee-client patch is under review in the OP-TEE project [1] and should be merged in the next OP-TEE release 3.5.0.
This change drops !BR2_STATIC_LIBS constraint on package optee-client and its dependent packages that are optee-benchmark, optee-examples, and optee-test.
[1] https://github.com/OP-TEE/optee_client/pull/147
---
Changes v1 -> v2:
- Rebase to fix merge conflicts.
- Squash commit series for OP-TEE packages into a single change.
--- package/optee-benchmark/Config.in | 5 +-- ...pport-BUILD_STATIC_LIBS-BUILD_SHARED_LIBS.patch | 51 ++++++++++++++++++++++ package/optee-client/Config.in | 5 +-- package/optee-examples/Config.in | 5 +-- package/optee-test/Config.in | 5 +-- 5 files changed, 59 insertions(+), 12 deletions(-) create mode 100644 package/optee-client/0002-cmake-support-BUILD_STATIC_LIBS-BUILD_SHARED_LIBS.patch
package/optee-benchmark/Config.in +2 -3
@@ -1,6 +1,5 @@ config BR2_PACKAGE_OPTEE_BENCHMARK bool "optee-benchmark" - depends on !BR2_STATIC_LIBS # optee-client depends on BR2_TOOLCHAIN_HAS_THREADS # optee-client select BR2_PACKAGE_OPTEE_CLIENT select BR2_PACKAGE_LIBYAML
@@ -12,5 +11,5 @@ config BR2_PACKAGE_OPTEE_BENCHMARK http://github.com/linaro-swg/optee_benchmark -comment "optee-benchmark needs a toolchain w/ dynamic library and threads" - depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS +comment "optee-benchmark needs a toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS
package/optee-client/0002-cmake-support-BUILD_STATIC_LIBS-BUILD_SHARED_LIBS.patch new file +51 -0
51 lines not on this page · raw message
package/optee-client/Config.in +2 -3
@@ -1,6 +1,5 @@ config BR2_PACKAGE_OPTEE_CLIENT bool "optee-client" - depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_HAS_THREADS help Enable the OP-TEE client package that brings non-secure
@@ -14,5 +13,5 @@ config BR2_PACKAGE_OPTEE_CLIENT https://github.com/OP-TEE/optee_client -comment "optee-client needs a toolchain w/ dynamic library and threads" - depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS +comment "optee-client needs a toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS
package/optee-examples/Config.in +2 -3
@@ -1,7 +1,6 @@ config BR2_PACKAGE_OPTEE_EXAMPLES bool "optee-examples" depends on BR2_TARGET_OPTEE_OS - depends on !BR2_STATIC_LIBS # optee-client depends on BR2_TOOLCHAIN_HAS_THREADS # optee-client select BR2_PACKAGE_OPTEE_CLIENT select BR2_TARGET_OPTEE_OS_SDK
@@ -19,6 +18,6 @@ config BR2_PACKAGE_OPTEE_EXAMPLES https://github.com/linaro-swg/optee_examples -comment "optee-examples needs a toolchain w/ dynamic library and threads" +comment "optee-examples needs a toolchain w/ threads" depends on BR2_TARGET_OPTEE_OS - depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_TOOLCHAIN_HAS_THREADS
package/optee-test/Config.in +2 -3
@@ -1,7 +1,6 @@ config BR2_PACKAGE_OPTEE_TEST bool "optee-test" depends on BR2_TARGET_OPTEE_OS - depends on !BR2_STATIC_LIBS # optee-client depends on BR2_TOOLCHAIN_HAS_THREADS # optee-client select BR2_PACKAGE_OPTEE_CLIENT select BR2_TARGET_OPTEE_OS_SDK
@@ -23,6 +22,6 @@ config BR2_PACKAGE_OPTEE_TEST http://github.com/OP-TEE/optee_test -comment "optee-test needs a toolchain w/ dynamic library and threads" +comment "optee-test needs a toolchain w/ threads" depends on BR2_TARGET_OPTEE_OS - depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_TOOLCHAIN_HAS_THREADS
Signature · 1 line
1.9.1
Thomas Petazzoni
AppliedPATCH v2 1/1 package/optee-*: support BR2_STATIC_LIBS=y
Quoted 9 lines · On Fri, 8 Mar 2019 10:55:09 +0100 Etienne Carriere…
Patch current optee-client 3.4.0 to support building resources with static linkage of executable binaries with the user libraries. The optee-client patch is under review in the OP-TEE project [1] and should be merged in the next OP-TEE release 3.5.0.
This change drops !BR2_STATIC_LIBS constraint on package optee-client and its dependent packages that are optee-benchmark, optee-examples, and optee-test.
Quoted 7 lines
[1] https://github.com/OP-TEE/optee_client/pull/147
Signed-off-by Etienne Carriere <[email protected]>---
Changes v1 -> v2:
- Rebase to fix merge conflicts.
- Squash commit series for OP-TEE packages into a single change.
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com