diff options
| author | Otavio Salvador <otavio@ossystems.com.br> | 2011-11-02 18:41:11 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-11-08 21:44:36 +0000 |
| commit | 07222a1142027fd282348f5ead9ecd5fad555d6d (patch) | |
| tree | a7d58b04dcf6fed8d4845599bf133065dfe42d7a /meta | |
| parent | e1e8910b9f43ee13f1a7688da23bd6b3ffca88f8 (diff) | |
| download | ast2050-yocto-poky-07222a1142027fd282348f5ead9ecd5fad555d6d.zip ast2050-yocto-poky-07222a1142027fd282348f5ead9ecd5fad555d6d.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)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -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 3506530..184b58a 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 a31ba3f..dd63d9e 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" |
