diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2011-11-02 18:41:11 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-01-30 16:38:13 +0000 |
commit | 501211d4d5d186373a80e8d3afda969fdcf257f1 (patch) | |
tree | 7cf4d9bc45fd8ff256a869262b369f726956408f /meta/recipes-support/libcap | |
parent | 155aad308c659afc1076c35c5a568987f083132d (diff) | |
download | poky-501211d4d5d186373a80e8d3afda969fdcf257f1.tar.gz |
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.
(From OE-Core rev: f768ef66c107410d4e81a69543d41910bbc6a26e)
(From OE-Core rev: 76be81b5b0f56536dd36e800bc3f597aeea6d8ef)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/libcap')
-rw-r--r-- | meta/recipes-support/libcap/libcap.inc | 15 | ||||
-rw-r--r-- | meta/recipes-support/libcap/libcap_2.22.bb | 2 |
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() { | |||
21 | sed -e 's,BUILD_CFLAGS ?=,BUILD_CFLAGS := $(BUILD_CFLAGS),' -i Make.Rules | 21 | sed -e 's,BUILD_CFLAGS ?=,BUILD_CFLAGS := $(BUILD_CFLAGS),' -i Make.Rules |
22 | } | 22 | } |
23 | 23 | ||
24 | EXTRA_OEMAKE = "LIBATTR=yes PAM_CAP=${@base_contains('DISTRO_FEATURES', 'pam', 'yes', 'no', d)} INDENT= SYSTEM_HEADERS=${STAGING_INCDIR} RAISE_SETFCAP=no" | 24 | EXTRA_OEMAKE = " \ |
25 | EXTRA_OEMAKE_virtclass-native = "LIBATTR=no PAM_CAP=no INDENT= " | 25 | LIBATTR=yes \ |
26 | EXTRA_OEMAKE += " lib=${@os.path.basename('${libdir}')}" | 26 | PAM_CAP=${@base_contains('DISTRO_FEATURES', 'pam', 'yes', 'no', d)} \ |
27 | INDENT= SYSTEM_HEADERS=${STAGING_INCDIR} RAISE_SETFCAP=no \ | ||
28 | lib=${@os.path.basename('${libdir}')} \ | ||
29 | " | ||
30 | EXTRA_OEMAKE_virtclass-native = " \ | ||
31 | LIBATTR=no \ | ||
32 | PAM_CAP=no \ | ||
33 | INDENT= \ | ||
34 | lib=${@os.path.basename('${libdir}')} \ | ||
35 | " | ||
27 | 36 | ||
28 | do_compile() { | 37 | do_compile() { |
29 | oe_runmake | 38 | 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 @@ | |||
1 | require libcap.inc | 1 | require libcap.inc |
2 | 2 | ||
3 | PR = "r1" | 3 | PR = "r2" |
4 | 4 | ||
5 | SRC_URI[md5sum] = "ce64058bdb3f086ddbfca8ce6c919845" | 5 | SRC_URI[md5sum] = "ce64058bdb3f086ddbfca8ce6c919845" |
6 | SRC_URI[sha256sum] = "73ebbd4877b5f69dd28b72098e510c5b318bc480f8201c4061ac98b78c04050f" | 6 | SRC_URI[sha256sum] = "73ebbd4877b5f69dd28b72098e510c5b318bc480f8201c4061ac98b78c04050f" |