[oe] [PATCH] shadow: fix rpath issues

Eric Bénard eric at eukrea.com
Fri Feb 18 12:30:54 UTC 2011


* add --disable-rpath (not enough with angstrom 2008.1)
* fix build problems with rpath on older libtool
* bump INC_PR

Signed-off-by: Eric Bénard <eric at eukrea.com>
---
 recipes/shadow/shadow.inc |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/recipes/shadow/shadow.inc b/recipes/shadow/shadow.inc
index 1b105c5..d688064 100644
--- a/recipes/shadow/shadow.inc
+++ b/recipes/shadow/shadow.inc
@@ -13,7 +13,7 @@ DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
 
 PACKAGE_ARCH_${PN} = "${MACHINE_ARCH}"
 
-INC_PR = "r18"
+INC_PR = "r19"
 
 # Additional Policy files for PAM
 PAM_SRC_URI = " \
@@ -39,6 +39,7 @@ EXTRA_OECONF += "\
     --without-audit \
     --without-selinux \
     --without-libcrack \
+    --disable-rpath \
     ${@base_contains('DISTRO_FEATURES', 'pam', '--with-libpam', '--without-libpam', d)} \
 "
 
@@ -70,6 +71,12 @@ shadow_cv_passwd_dir=${bindir}
 END
 }
 
+do_configure_append () {
+    # use same fix as libiconv
+    sed -i -e  s/^hardcode_libdir_flag_spec/#hardcode_libdir_flag_spec/ \
+           -e s/^runpath_var/#runpath_var/ ${S}/*-libtool
+}
+
 do_install_append() {
   # Ensure that /etc/skel is created so any default files that we want copied into new users home
   # dirs can be put in there later (ideal for .xinitrc for example).
-- 
1.7.0.4





More information about the Openembedded-devel mailing list