From 8a3974c74138e0ae8f9ae90b2b6aab1d931bfd04 Mon Sep 17 00:00:00 2001 From: Xavier Roche Date: Tue, 17 Mar 2015 16:49:33 +0100 Subject: [PATCH] Fix potential issue in LDFLAGS export Change-Id: Icf1810caec9bfe51963d5a7186d449b69f7b4db5 Signed-off-by: Xavier Roche --- meta-tizen-common-base/recipes-security/cynara/cynara.inc | 6 ++++-- .../recipes-security/security-manager/security-manager.inc | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/meta-tizen-common-base/recipes-security/cynara/cynara.inc b/meta-tizen-common-base/recipes-security/cynara/cynara.inc index 5e50c60..9ada02a 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,7 +167,8 @@ do_compile() { -DBUILD_TESTS=OFF \ -DCMAKE_BUILD_TYPE=RELEASE \ -DCMAKE_VERBOSE_MAKEFILE=ON - oe_runmake + +oe_runmake 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 0e5217c..1556e59 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 \ -- 2.7.4