diff options
author | Xavier Roche <xavrock.os@gmail.com> | 2015-03-17 16:49:33 +0100 |
---|---|---|
committer | Xavier Roche <xavrock.os@gmail.com> | 2015-03-17 16:49:33 +0100 |
commit | 71b38d995e3df78100cd3c05bf11c7fd91a55ea5 (patch) | |
tree | 65882fa5963d10675ddfad55a9efb70c2345f0a1 | |
parent | e28bc7350fa4242a3c3b666a8d3f30d91a91a58b (diff) | |
download | meta-tizen-71b38d995e3df78100cd3c05bf11c7fd91a55ea5.tar.gz meta-tizen-71b38d995e3df78100cd3c05bf11c7fd91a55ea5.tar.bz2 meta-tizen-71b38d995e3df78100cd3c05bf11c7fd91a55ea5.zip |
Fix potential issue in LDFLAGS exportsandbox/xroche/devel-common
Signed-off-by: Xavier Roche <xavrock.os@gmail.com>
-rw-r--r-- | meta-tizen-common-base/recipes-security/cynara/cynara.inc | 4 | ||||
-rw-r--r-- | meta-tizen-common-base/recipes-security/security-manager/security-manager.inc | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/meta-tizen-common-base/recipes-security/cynara/cynara.inc b/meta-tizen-common-base/recipes-security/cynara/cynara.inc index c4ad6e5a..33ca6f56 100644 --- a/meta-tizen-common-base/recipes-security/cynara/cynara.inc +++ b/meta-tizen-common-base/recipes-security/cynara/cynara.inc @@ -108,6 +108,7 @@ DEPENDS += "dbus" inherit pkgconfig DEPENDS += "gmock" DEPENDS += "gtest" + do_prep() { cd ${S} chmod -Rf a+rX,u+w,g-w,o-w ${S} @@ -148,7 +149,7 @@ do_compile() { -DCYNARA_LIB_PATH=\\\"${prefix}/lib/cynara/\\\" \ -DCYNARA_TESTS_DIR=\\\"${prefix}/share/cynara/tests/\\\" \ -DCYNARA_CONFIGURATION_DIR=\\\"${sysconfdir}/cynara/\\\"" - export LDFLAGS+=" -Wl,--rpath=${prefix}/lib " + export LDFLAGS="${LDFLAGS} -Wl,--rpath=${prefix}/lib " cmake \ @@ -166,6 +167,7 @@ do_compile() { -DBUILD_TESTS=OFF \ -DCMAKE_BUILD_TYPE=RELEASE \ -DCMAKE_VERBOSE_MAKEFILE=ON + make ${PARALLEL_MAKE} diff --git a/meta-tizen-common-base/recipes-security/security-manager/security-manager.inc b/meta-tizen-common-base/recipes-security/security-manager/security-manager.inc index 1e22466d..1053e468 100644 --- a/meta-tizen-common-base/recipes-security/security-manager/security-manager.inc +++ b/meta-tizen-common-base/recipes-security/security-manager/security-manager.inc @@ -78,7 +78,7 @@ do_compile() { LD_AS_NEEDED=1; export LD_AS_NEEDED ; - export LDFLAGS+=" -Wl,--rpath=${prefix}/lib " + export LDFLAGS=" ${LDFLAGS} -Wl,--rpath=${prefix}/lib " cmake \ |