diff options
author | José Bollo <jose.bollo@iot.bzh> | 2018-01-24 11:38:43 +0100 |
---|---|---|
committer | José Bollo <jose.bollo@iot.bzh> | 2018-02-13 11:02:00 +0100 |
commit | f70d712e4f505f5c5b50ae17f4f023d20a667568 (patch) | |
tree | 57b0aaa702651012e1adfc07f9b6b6c580506f66 /meta-security/recipes-security/cynara/cynara/gmock-pthread-linking.patch | |
parent | 3f962c7d202055777dd0238f12dbcf70f09ac07d (diff) |
Integrate parts of meta-intel-iot-security
Adds the recipes of the sub layers
- meta-security-framework
- meta-security-smack
Change-Id: I618608008a3b3d1d34adb6e38048110f13ac0643
Signed-off-by: José Bollo <jose.bollo@iot.bzh>
Diffstat (limited to 'meta-security/recipes-security/cynara/cynara/gmock-pthread-linking.patch')
-rw-r--r-- | meta-security/recipes-security/cynara/cynara/gmock-pthread-linking.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/meta-security/recipes-security/cynara/cynara/gmock-pthread-linking.patch b/meta-security/recipes-security/cynara/cynara/gmock-pthread-linking.patch new file mode 100644 index 000000000..1a204eb14 --- /dev/null +++ b/meta-security/recipes-security/cynara/cynara/gmock-pthread-linking.patch @@ -0,0 +1,31 @@ +From 80cc04091410d6a322fee1a2922fdf867395f00a Mon Sep 17 00:00:00 2001 +From: Patrick Ohly <patrick.ohly@intel.com> +Date: Fri, 29 May 2015 10:21:57 +0200 +Subject: [PATCH] work around gmock pthread dependency + +In meta-oe, gmock's .pc file does not declare that users of +gmock must link against pthread. Let's work around that +here by always linking tests against libpthread. + +Upstream-status: Inappropriate [embedded specific] + +Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> +--- + test/CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt +index 25a70db..f490a24 100644 +--- a/test/CMakeLists.txt ++++ b/test/CMakeLists.txt +@@ -138,6 +138,7 @@ ADD_EXECUTABLE(${TARGET_CYNARA_TESTS} + TARGET_LINK_LIBRARIES(${TARGET_CYNARA_TESTS} + ${PKGS_LDFLAGS} + ${PKGS_LIBRARIES} ++ pthread + crypt + ) + INSTALL(TARGETS ${TARGET_CYNARA_TESTS} DESTINATION ${BIN_INSTALL_DIR}) +-- +2.1.4 + |