summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/libcap
diff options
context:
space:
mode:
authorYu Ke <ke.yu@intel.com>2011-07-11 15:23:20 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-12 14:56:59 +0100
commit2919954a2cbd41a08b99b691b8f7502b061267f1 (patch)
tree11f705a28b12170a9c7b884874389bdce00568cc /meta/recipes-support/libcap
parent603c5a241f0549da00334ac62dcbd1b0a72b6c82 (diff)
downloadopenembedded-core-2919954a2cbd41a08b99b691b8f7502b061267f1.tar.gz
openembedded-core-2919954a2cbd41a08b99b691b8f7502b061267f1.tar.bz2
openembedded-core-2919954a2cbd41a08b99b691b8f7502b061267f1.zip
libcap: fix for non /usr/lib libdir case
the recipe has hardcoded "lib=lib", which does not work in libdir=/usr/lib64 case where should be "lib=lib64", So this patch fix it by replacing lib with libdir Signed-off-by: Yu Ke <ke.yu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/libcap')
-rw-r--r--meta/recipes-support/libcap/libcap.inc5
-rw-r--r--meta/recipes-support/libcap/libcap_2.20.bb2
2 files changed, 4 insertions, 3 deletions
diff --git a/meta/recipes-support/libcap/libcap.inc b/meta/recipes-support/libcap/libcap.inc
index 93bdf951de..3bff3b99cf 100644
--- a/meta/recipes-support/libcap/libcap.inc
+++ b/meta/recipes-support/libcap/libcap.inc
@@ -20,8 +20,9 @@ do_configure() {
sed -e 's,BUILD_CFLAGS ?=,BUILD_CFLAGS := $(BUILD_CFLAGS),' -i Make.Rules
}
-EXTRA_OEMAKE = "LIBATTR=yes PAM_CAP=yes INDENT= lib=lib SYSTEM_HEADERS=${STAGING_INCDIR} RAISE_SETFCAP=no"
-EXTRA_OEMAKE_virtclass-native = "LIBATTR=no PAM_CAP=no INDENT= lib=lib"
+EXTRA_OEMAKE = "LIBATTR=yes PAM_CAP=yes 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}')}"
do_compile() {
oe_runmake
diff --git a/meta/recipes-support/libcap/libcap_2.20.bb b/meta/recipes-support/libcap/libcap_2.20.bb
index ab3638a150..c9741c252a 100644
--- a/meta/recipes-support/libcap/libcap_2.20.bb
+++ b/meta/recipes-support/libcap/libcap_2.20.bb
@@ -1,6 +1,6 @@
require libcap.inc
-PR = "r1"
+PR = "r2"
SRC_URI[md5sum] = "10e47ed32ca2214eb0e58780282d27b4"
SRC_URI[sha256sum] = "20e7c1ea4d3d5c410efb3a6ff138dc417912fae316d883460dcd58d9803a9220"