diff options
| author | Baptiste Durand <baptiste.durand@open.eurogiciel.org> | 2015-03-16 10:43:53 +0100 |
|---|---|---|
| committer | Jean-Benoit MARTIN <jean-benoit.martin@open.eurogiciel.org> | 2015-06-16 14:31:24 +0200 |
| commit | f3a300fdd1e28f5558328e929f82d0d342c5466d (patch) | |
| tree | 045c9671c3f2a4e96dea5cec3a952421913d97f8 | |
| parent | 4ff06a3e9d28781b8124ba459870d869e44395c4 (diff) | |
| download | meta-tizen-f3a300fdd1e28f5558328e929f82d0d342c5466d.tar.gz meta-tizen-f3a300fdd1e28f5558328e929f82d0d342c5466d.tar.bz2 meta-tizen-f3a300fdd1e28f5558328e929f82d0d342c5466d.zip | |
Fix cynara & security-manager build
Change-Id: I8f827cdca99a16a27ac61d4e2b100a466eab1243
Signed-off-by: Baptiste Durand <baptiste.durand@open.eurogiciel.org>
| -rw-r--r-- | meta-tizen-common-base/recipes-security/cynara/cynara.inc | 8 | ||||
| -rw-r--r-- | meta-tizen-common-base/recipes-security/security-manager/security-manager.inc | 9 |
2 files changed, 9 insertions, 8 deletions
diff --git a/meta-tizen-common-base/recipes-security/cynara/cynara.inc b/meta-tizen-common-base/recipes-security/cynara/cynara.inc index 181111ff..5e50c60d 100644 --- a/meta-tizen-common-base/recipes-security/cynara/cynara.inc +++ b/meta-tizen-common-base/recipes-security/cynara/cynara.inc @@ -106,8 +106,8 @@ inherit tizen_cmake DEPENDS += "zip" DEPENDS += "dbus" inherit pkgconfig -DEPENDS += "pkgconfig(gmock)" - +DEPENDS += "gmock" +DEPENDS += "gtest" do_prep() { cd ${S} chmod -Rf a+rX,u+w,g-w,o-w ${S} @@ -148,7 +148,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+=" -Wl,--rpath=${prefix}/lib " cmake \ @@ -163,7 +163,7 @@ do_compile() { -DBUILD_SHARED_LIBS:BOOL=ON \ -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ ${EXTRA_OECMAKE} . \ - -DBUILD_TESTS=ON \ + -DBUILD_TESTS=OFF \ -DCMAKE_BUILD_TYPE=RELEASE \ -DCMAKE_VERBOSE_MAKEFILE=ON 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 36313bbf..0e5217c5 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 @@ -47,11 +47,12 @@ DEPENDS += "boost" DEPENDS += "tizen-platform-config" inherit pkgconfig DEPENDS += "smack" -DEPENDS += "pkgconfig(cynara-client)" +DEPENDS += "libcynara-client" DEPENDS += "sqlite3" DEPENDS += "libcap" -DEPENDS += "pkgconfig(cynara-admin)" +DEPENDS += "libcynara-admin" DEPENDS += "libslp-db-util" +DEPENDS += "libcap" do_prep() { cd ${S} @@ -77,7 +78,7 @@ do_compile() { LD_AS_NEEDED=1; export LD_AS_NEEDED ; - export LDFLAGS+="-Wl,--rpath=${prefix}/lib" + export LDFLAGS+=" -Wl,--rpath=${prefix}/lib " cmake \ @@ -103,7 +104,7 @@ do_compile() { } -do_install() { +do_install() { export RPM_BUILD_ROOT=${D} cd ${S} LANG=C |