From 07222a1142027fd282348f5ead9ecd5fad555d6d Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Wed, 2 Nov 2011 18:41:11 +0000 Subject: 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 Signed-off-by: Richard Purdie --- meta/recipes-support/libcap/libcap.inc | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'meta/recipes-support/libcap/libcap.inc') 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 -- cgit v1.2.3-54-g00ecf