summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/libcap
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2011-11-02 18:41:11 +0000
committerSaul Wold <sgw@linux.intel.com>2011-11-08 11:19:48 -0800
commitf768ef66c107410d4e81a69543d41910bbc6a26e (patch)
treed51fa555abd43b34563dfd61f3e3c346cdc35e9a /meta/recipes-support/libcap
parent77fe9dd8fa0393132ac6aba00d5659c6781fbbde (diff)
downloadopenembedded-core-f768ef66c107410d4e81a69543d41910bbc6a26e.tar.gz
openembedded-core-f768ef66c107410d4e81a69543d41910bbc6a26e.tar.bz2
openembedded-core-f768ef66c107410d4e81a69543d41910bbc6a26e.zip
libcap: fix sstate for native package
The 'lib' option needs to be given on target and native builds otherwise it installs the binaries at ${libdir}64 when host is 64bit. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'meta/recipes-support/libcap')
-rw-r--r--meta/recipes-support/libcap/libcap.inc15
-rw-r--r--meta/recipes-support/libcap/libcap_2.22.bb2
2 files changed, 13 insertions, 4 deletions
diff --git a/meta/recipes-support/libcap/libcap.inc b/meta/recipes-support/libcap/libcap.inc
index 350653071e..184b58a3e0 100644
--- a/meta/recipes-support/libcap/libcap.inc
+++ b/meta/recipes-support/libcap/libcap.inc
@@ -21,9 +21,18 @@ do_configure() {
sed -e 's,BUILD_CFLAGS ?=,BUILD_CFLAGS := $(BUILD_CFLAGS),' -i Make.Rules
}
-EXTRA_OEMAKE = "LIBATTR=yes PAM_CAP=${@base_contains('DISTRO_FEATURES', 'pam', 'yes', 'no', d)} INDENT= SYSTEM_HEADERS=${STAGING_INCDIR} RAISE_SETFCAP=no"
-EXTRA_OEMAKE_virtclass-native = "LIBATTR=no PAM_CAP=no INDENT= "
-EXTRA_OEMAKE += " lib=${@os.path.basename('${libdir}')}"
+EXTRA_OEMAKE = " \
+ LIBATTR=yes \
+ PAM_CAP=${@base_contains('DISTRO_FEATURES', 'pam', 'yes', 'no', d)} \
+ INDENT= SYSTEM_HEADERS=${STAGING_INCDIR} RAISE_SETFCAP=no \
+ lib=${@os.path.basename('${libdir}')} \
+"
+EXTRA_OEMAKE_virtclass-native = " \
+ LIBATTR=no \
+ PAM_CAP=no \
+ INDENT= \
+ lib=${@os.path.basename('${libdir}')} \
+"
do_compile() {
oe_runmake
diff --git a/meta/recipes-support/libcap/libcap_2.22.bb b/meta/recipes-support/libcap/libcap_2.22.bb
index a31ba3fadd..dd63d9e742 100644
--- a/meta/recipes-support/libcap/libcap_2.22.bb
+++ b/meta/recipes-support/libcap/libcap_2.22.bb
@@ -1,6 +1,6 @@
require libcap.inc
-PR = "r1"
+PR = "r2"
SRC_URI[md5sum] = "ce64058bdb3f086ddbfca8ce6c919845"
SRC_URI[sha256sum] = "73ebbd4877b5f69dd28b72098e510c5b318bc480f8201c4061ac98b78c04050f"