diff options
| author |   Tom Rini <tom_rini@mentor.com> | 2011-02-17 15:25:28 -0700 |
|---|---|---|
| committer | Tom Rini <tom_rini@mentor.com> | 2011-02-18 08:16:40 -0700 |
| commit | af75d1bbac07cddde4a454f39e0421ec92e1f1ed (patch) | |
| tree | 5c6c675ee1bc6633fc5a09e4024b7eef5be3bece | |
| parent | 233e54b47a5c32c1f7f4b63646e747cc95000294 (diff) | |
| download | openembedded-af75d1bbac07cddde4a454f39e0421ec92e1f1ed.tar.gz | |
acl: Fix RPATH QA issue and clean up
We take some bits from poky to fix the RPATH QA issue and while in here
clean it up a bit based on Ubuntu/Debian.
Signed-off-by: Tom Rini <tom_rini@mentor.com>
| -rw-r--r-- | recipes/udev/acl_2.2.49.bb | 46 |
1 files changed, 17 insertions, 29 deletions
diff --git a/recipes/udev/acl_2.2.49.bb b/recipes/udev/acl_2.2.49.bb index 5a37c5748b..e0b3f90202 100644 --- a/recipes/udev/acl_2.2.49.bb +++ b/recipes/udev/acl_2.2.49.bb @@ -1,8 +1,6 @@ DESCRIPTION = "Commands for Manipulating POSIX Access Control Lists" LICENSE = "GPLv2" - -PR = "r3" - +PR = "r4" DEPENDS = "attr" SRC_URI = "http://mirror.its.uidaho.edu/pub/savannah/acl/acl-${PV}.src.tar.gz \ @@ -13,44 +11,34 @@ 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\', + ${S}/config.status + # gettext hack 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() { - 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} -} + oe_runmake DIST_ROOT='${D}' install install-dev install-lib + # 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" |