[oe-commits] Tom Rini : acl: Revert most of my last change, just fix RPATH QA
git version control
git at git.openembedded.org
Fri Feb 18 20:28:26 UTC 2011
Module: openembedded.git
Branch: master
Commit: ba90568ce479e64bff1f9561eecbe934ac710915
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=ba90568ce479e64bff1f9561eecbe934ac710915
Author: Tom Rini <tom_rini at mentor.com>
Date: Fri Feb 18 12:58:29 2011 -0700
acl: Revert most of my last change, just fix RPATH QA
Signed-off-by: Tom Rini <tom_rini at mentor.com>
---
recipes/udev/acl_2.2.49.bb | 40 +++++++++++++++++++++++++++-------------
1 files changed, 27 insertions(+), 13 deletions(-)
diff --git a/recipes/udev/acl_2.2.49.bb b/recipes/udev/acl_2.2.49.bb
index e0b3f90..7b68a12 100644
--- a/recipes/udev/acl_2.2.49.bb
+++ b/recipes/udev/acl_2.2.49.bb
@@ -1,6 +1,6 @@
DESCRIPTION = "Commands for Manipulating POSIX Access Control Lists"
LICENSE = "GPLv2"
-PR = "r4"
+PR = "r5"
DEPENDS = "attr"
SRC_URI = "http://mirror.its.uidaho.edu/pub/savannah/acl/acl-${PV}.src.tar.gz \
@@ -11,15 +11,10 @@ inherit autotools lib_package
TOPDIR[unexport] = "1"
EXTRA_OECONF = " --enable-gettext=yes \
- --libdir=${base_libdir} --libexecdir=${libdir} \
ac_cv_path_XGETTEXT=${STAGING_BINDIR_NATIVE}/xgettext \
ac_cv_path_MSGFMT=${STAGING_BINDIR_NATIVE}/msgfmt \
ac_cv_path_MSGMERGE=${STAGING_BINDIR_NATIVE}/msgmerge "
-do_configure_prepend() {
- ${@base_contains('DISTRO_FEATURES', 'largefile', '', 'sed -i -e "s/-D_FILE_OFFSET_BITS=64//" ${S}/include/builddefs.in', d)}
-}
-
do_configure_append() {
# Fix RPATH issues.
sed -i ${S}/config.status -e s,^\\\(hardcode_into_libs=\\\).*$,\\1\'no\',
@@ -29,16 +24,35 @@ do_configure_append() {
echo "#define _(str) str" >> ${S}/include/config.h
}
+do_configure_prepend() {
+ ${@base_contains('DISTRO_FEATURES', 'largefile', '', 'sed -i -e "s/-D_FILE_OFFSET_BITS=64//" ${S}/include/builddefs.in', d)}
+}
+
do_install() {
- oe_runmake DIST_ROOT='${D}' install install-dev install-lib
+ export PKG_BIN_DIR=${D}${bindir}
+ export PKG_SBIN_DIR=${D}${sbindir}
+ export PKG_LIB_DIR=${D}${libdir}
+ export PKG_DEVLIB_DIR=${D}${libexecdir}
+ export PKG_INC_DIR=${D}${includedir}
+ export PKG_MAN_DIR=${D}${mandir}
+ export PKG_DOC_DIR=${D}${datadir}/doc/acl
+ export PKG_LOCALE_DIR=${D}${datadir}/locale
+ # ensure the subdir Makefile do not use the (wrong) variable overrides from the include file
+ export MAKE="${MAKE} -e"
+
+ oe_runmake -e install install-dev install-lib
+
+ sed -i -e s:installed=yes:installed=no: -e s:${STAGING_LIBDIR}:${libdir}:g ${D}${libdir}/libacl.la
+
+ # Move .a and .la into libdir and remove symlinks pointing to ${S}
+ for file in ${D}${libexecdir}/*a ; do
+ rm ${D}${libdir}/$(basename $file)
+ mv $file ${D}${libdir}
+ done
+ rm -rf ${D}${libexecdir}
+}
- # Remove bogus symlinks
- rm -f ${D}${base_libdir}/libacl.la ${D}${base_libdir}/libacl.a
- # libdir should point to .la
- sed -i ${D}${libdir}/libacl.la -e \
- s,^libdir=\'${base_libdir}\'$,libdir=\'${libdir}\',
-}
SRC_URI[md5sum] = "181445894cca986da9ae0099d5ce2d08"
SRC_URI[sha256sum] = "b9c7f4752e4ef4930a62fa5aa0d7efe1cba2b5a3a2d6ee2b45c0a70c72b7e5d5"
More information about the Openembedded-commits
mailing list