Patchwork [CONSOLIDATED,PULL,02/17] libcap: fix sstate for native package

login
register
mail settings
Submitter Saul Wold
Date Nov. 8, 2011, 7:22 p.m.
Message ID <f768ef66c107410d4e81a69543d41910bbc6a26e.1320780004.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/14541/
State New
Headers show

Comments

Saul Wold - Nov. 8, 2011, 7:22 p.m.
From: Otavio Salvador <otavio@ossystems.com.br>

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>
---
 meta/recipes-support/libcap/libcap.inc     |   15 ++++++++++++---
 meta/recipes-support/libcap/libcap_2.22.bb |    2 +-
 2 files changed, 13 insertions(+), 4 deletions(-)

Patch

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"