summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/libcap
diff options
context:
space:
mode:
authorScott Garman <scott.a.garman@intel.com>2012-01-04 22:30:30 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-05 11:17:48 +0000
commit3a52df9c057b25c25fc2013ac6c5bf602cc8b4a7 (patch)
tree18bc81b13f59c03aef739fdd9baad765c770c63d /meta/recipes-support/libcap
parent796c3d038fb7892a5e5206fb10217623de18853f (diff)
downloadopenembedded-core-3a52df9c057b25c25fc2013ac6c5bf602cc8b4a7.tar.gz
openembedded-core-3a52df9c057b25c25fc2013ac6c5bf602cc8b4a7.tar.bz2
openembedded-core-3a52df9c057b25c25fc2013ac6c5bf602cc8b4a7.zip
libcap: move library to base_libdir
ls from coreutils links to libcap, so move the libcap library from libdir (/usr/lib) to base_libdir (/lib). Signed-off-by: Scott Garman <scott.a.garman@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.inc15
-rw-r--r--meta/recipes-support/libcap/libcap_2.22.bb2
2 files changed, 14 insertions, 3 deletions
diff --git a/meta/recipes-support/libcap/libcap.inc b/meta/recipes-support/libcap/libcap.inc
index 184b58a3e0..9418abf1e2 100644
--- a/meta/recipes-support/libcap/libcap.inc
+++ b/meta/recipes-support/libcap/libcap.inc
@@ -21,6 +21,8 @@ do_configure() {
sed -e 's,BUILD_CFLAGS ?=,BUILD_CFLAGS := $(BUILD_CFLAGS),' -i Make.Rules
}
+BUILD_LDFLAGS_virtclass_native += "-Wl,rpath=${base_libdir}"
+
EXTRA_OEMAKE = " \
LIBATTR=yes \
PAM_CAP=${@base_contains('DISTRO_FEATURES', 'pam', 'yes', 'no', d)} \
@@ -42,8 +44,17 @@ do_install() {
oe_runmake install DESTDIR="${D}" prefix="${prefix}"
}
+do_install_append() {
+ # Move the library to base_libdir
+ install -d ${D}${base_libdir}
+ mv ${D}${libdir}/* ${D}${base_libdir}
+ rmdir ${D}${libdir}
+}
+
+FILES_${PN}-dev += "${base_libdir}/*.so"
+
# pam files
-FILES_${PN} += "${libdir}/security/*.so"
-FILES_${PN}-dbg += "${libdir}/security/.debug/*.so"
+FILES_${PN} += "${base_libdir}/security/*.so"
+FILES_${PN}-dbg += "${base_libdir}/security/.debug/*.so"
BBCLASSEXTEND = "native"
diff --git a/meta/recipes-support/libcap/libcap_2.22.bb b/meta/recipes-support/libcap/libcap_2.22.bb
index dd63d9e742..be1df547ad 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 = "r2"
+PR = "r3"
SRC_URI[md5sum] = "ce64058bdb3f086ddbfca8ce6c919845"
SRC_URI[sha256sum] = "73ebbd4877b5f69dd28b72098e510c5b318bc480f8201c4061ac98b78c04050f"