package/optee-*: packages depend on thread support

BR2_PACKAGE_OPTEE_CLIENT depends on BR2_TOOLCHAIN_HAS_THREADS.
Library teec uses pthread support to protect clients state management.

This change declares this dependency in package optee-client and
updates dependent packages accordingly: optee-benchmark, optee-client,
optee-examples and optee-test.

Fixes [1] and [2] where config selected an toolchain without thread
support and build failed with trace like:

  CMake Error at /home/buildroot/autobuild/run/instance-1/output/host/share/cmake-3.8/Modules/FindPackageHandleStandardArgs.cmake:137 (message):
    Could NOT find Threads (missing: Threads_FOUND)
  Call Stack (most recent call first):
    /home/buildroot/autobuild/run/instance-1/output/host/share/cmake-3.8/Modules/FindPackageHandleStandardArgs.cmake:377 (_FPHSA_FAILURE_MESSAGE)
    /home/buildroot/autobuild/run/instance-1/output/host/share/cmake-3.8/Modules/FindThreads.cmake:212 (FIND_PACKAGE_HANDLE_STANDARD_ARGS)
    libteec/CMakeLists.txt:8 (find_package)

[1] http://autobuild.buildroot.net/results/ed6ffe2197da4f3a970bd3c5522291236396cc8e
[2] http://autobuild.buildroot.net/results/406f90048db097580b626ef889823132f8676ba1

Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
[Thomas: fix dependencies of Config.in comment, as noticed by Baruch.]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>

diff --git a/package/optee-benchmark/Config.in b/package/optee-benchmark/Config.in
index 0e36549c949fe920edcc4d8705daeb3a2b9bae4e..b9326e0432e4205f9a921e2f3ae6ac0cae1c631d 100644 (file)
--- a/package/optee-benchmark/Config.in
+++ b/package/optee-benchmark/Config.in
@@ -1,6 +1,7 @@
 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
        help
@@ -11,5 +12,5 @@ config BR2_PACKAGE_OPTEE_BENCHMARK
 
          http://github.com/linaro-swg/optee_benchmark
 
-comment "optee-benchmark needs a toolchain w/ dynamic library"
-       depends on BR2_STATIC_LIBS
+comment "optee-benchmark needs a toolchain w/ dynamic library and threads"
+       depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS

diff --git a/package/optee-client/Config.in b/package/optee-client/Config.in
index db0b7b7f9fcca86fd134456db5b30ade0b86a9f6..833a6226a6ad4d1a3a606b604be3b0b8943ba9b0 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_STATIC_LIBS
+       depends on BR2_TOOLCHAIN_HAS_THREADS
        help
          Enable the OP-TEE client package that brings non-secure
          client application resources for OP-TEE support. OP-TEE
@@ -13,5 +14,5 @@ config BR2_PACKAGE_OPTEE_CLIENT
 
          https://github.com/OP-TEE/optee_client
 
-comment "optee-client needs a toolchain w/ dynamic library"
-       depends on BR2_STATIC_LIBS
+comment "optee-client needs a toolchain w/ dynamic library and threads"
+       depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS

diff --git a/package/optee-examples/Config.in b/package/optee-examples/Config.in
index 479f9204bba44f19638913112926000038fe4a84..62d0bf4b2a57827888828aa565b2015136dbbf14 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_STATIC_LIBS # optee-client
+       depends on BR2_TOOLCHAIN_HAS_THREADS # 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/ dynamic library"
+comment "optee-examples needs a toolchain w/ dynamic library and threads"
        depends on BR2_TARGET_OPTEE_OS
-       depends on BR2_STATIC_LIBS
+       depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS

diff --git a/package/optee-test/Config.in b/package/optee-test/Config.in
index 575790b1191087d46fd5bfb2a26c0ca3156e40e1..77c38c47fd0166861f052d4e2211f7a0b67bee3b 100644 (file)
--- a/package/optee-test/Config.in
+++ b/package/optee-test/Config.in
@@ -2,6 +2,7 @@ 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
        help
@@ -22,6 +23,6 @@ config BR2_PACKAGE_OPTEE_TEST
 
          http://github.com/OP-TEE/optee_test
 
-comment "optee-test needs a toolchain w/ dynamic library"
+comment "optee-test needs a toolchain w/ dynamic library and threads"
        depends on BR2_TARGET_OPTEE_OS
-       depends on BR2_STATIC_LIBS
+       depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS