summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support
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 15:00:47 +0100
commit7cbce4bf877f0c04b267d4bb45abc9e45698037c (patch)
tree8e0a0a849ffb49e57a6bcbd51a890ffa1244d128 /meta/recipes-support
parent668d80ea10a3bec9c837c0e719b778a46bd48cc5 (diff)
downloadpoky-7cbce4bf877f0c04b267d4bb45abc9e45698037c.tar.gz
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 (From OE-Core rev: 2919954a2cbd41a08b99b691b8f7502b061267f1) Signed-off-by: Yu Ke <ke.yu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support')
-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() {
20 sed -e 's,BUILD_CFLAGS ?=,BUILD_CFLAGS := $(BUILD_CFLAGS),' -i Make.Rules 20 sed -e 's,BUILD_CFLAGS ?=,BUILD_CFLAGS := $(BUILD_CFLAGS),' -i Make.Rules
21} 21}
22 22
23EXTRA_OEMAKE = "LIBATTR=yes PAM_CAP=yes INDENT= lib=lib SYSTEM_HEADERS=${STAGING_INCDIR} RAISE_SETFCAP=no" 23EXTRA_OEMAKE = "LIBATTR=yes PAM_CAP=yes INDENT= SYSTEM_HEADERS=${STAGING_INCDIR} RAISE_SETFCAP=no"
24EXTRA_OEMAKE_virtclass-native = "LIBATTR=no PAM_CAP=no INDENT= lib=lib" 24EXTRA_OEMAKE_virtclass-native = "LIBATTR=no PAM_CAP=no INDENT= "
25EXTRA_OEMAKE += " lib=${@os.path.basename('${libdir}')}"
25 26
26do_compile() { 27do_compile() {
27 oe_runmake 28 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 @@
1require libcap.inc 1require libcap.inc
2 2
3PR = "r1" 3PR = "r2"
4 4
5SRC_URI[md5sum] = "10e47ed32ca2214eb0e58780282d27b4" 5SRC_URI[md5sum] = "10e47ed32ca2214eb0e58780282d27b4"
6SRC_URI[sha256sum] = "20e7c1ea4d3d5c410efb3a6ff138dc417912fae316d883460dcd58d9803a9220" 6SRC_URI[sha256sum] = "20e7c1ea4d3d5c410efb3a6ff138dc417912fae316d883460dcd58d9803a9220"