From 3a52df9c057b25c25fc2013ac6c5bf602cc8b4a7 Mon Sep 17 00:00:00 2001 From: Scott Garman Date: Wed, 4 Jan 2012 22:30:30 -0800 Subject: 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 Signed-off-by: Richard Purdie --- meta/recipes-support/libcap/libcap.inc | 15 +++++++++++++-- meta/recipes-support/libcap/libcap_2.22.bb | 2 +- 2 files changed, 14 insertions(+), 3 deletions(-) (limited to 'meta/recipes-support/libcap') 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" -- cgit 1.2.3-korg