Skip to contentSkip to conversation

shadow: fix rpath issues

PATCH In review Eric Bénard 3 participants 5 messages Feb 18, 2011 – Feb 19, 2011

lore
Share & tools
lore

Eric Bénard

author
#0 lore raw

PATCH 1/1 shadow: fix rpath issues

* 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 <[email protected]>
---
 recipes/shadow/shadow.inc |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)
recipes/shadow/shadow.inc +8 -1
index 1b105c5..d688064 100644
@@ -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).
Signature · 1 line
1.7.0.4
#1 lore raw
Quoted 33 lines · Eric Bénard

* 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<[email protected]>
---
  recipes/shadow/shadow.inc |    9 ++++++++-
  1 files changed, 8 insertions(+), 1 deletions(-)
recipes/shadow/shadow.inc +2 -1
index 1b105c5..d688064 100644
@@ -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
  }

recipes/shadow/shadow.inc shadow_cv_passwd_dir=${bindir} · line 82

Quoted 10 lines
recipes/shadow/shadow.inc +6 -0
 
+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).

The equiv I found in poky is:
do_configure_append() {
# Fix RPATH issues.
sed -i ${S}/config.status -e
s,^\\\(hardcode_into_libs=\\\).*$,\\1\'no\',

    ${S}/config.status
}

Any preference? Aside from I think we should be internally consistent in these fixes, so long as it's fixed...

Signature · 2 lines
Tom Rini
Mentor Graphics Corporation
author
#2 lore raw
Quoted 10 lines · Tom Rini

The equiv I found in poky is:
do_configure_append() {
# Fix RPATH issues.
sed -i ${S}/config.status -e s,^\\\(hardcode_into_libs=\\\).*$,\\1\'no\', ${S}/config.status
}

Any preference? Aside from I think we should be internally consistent in these fixes, so long as it's fixed...

yes, in fact I copied the fix from Henning's fix in flac so it can be seen as consistent ;-)

Eric

#3 lore raw
Quoted 9 lines · Eric Bénard
Quoted 8 lines · Tom Rini

The equiv I found in poky is:
do_configure_append() {
# Fix RPATH issues.
sed -i ${S}/config.status -e s,^\\\(hardcode_into_libs=\\\).*$,\\1\'no\', ${S}/config.status
}

Quoted 3 lines
Quoted 3 lines

Any preference? Aside from I think we should be internally consistent in these
fixes, so long as it's fixed...

poky one is better IMO since its not hacking into generated libtool script

Quoted 11 lines
Quoted 1 line

yes, in fact I copied the fix from Henning's fix in flac so it can be seen as consistent ;-)

Eric

_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

author
#4 lore raw
In reply to Tom Rini

Hi Tom,

Quoted 24 lines · Tom Rini
Quoted 14 lines · Eric Bénard

* 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<[email protected]>>>
recipes/shadow/shadow.inc +6 -0
+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

Quoted 1 line
# dirs can be put in there later (ideal for .xinitrc for example).

The equiv I found in poky is:
do_configure_append() {
# Fix RPATH issues.
sed -i ${S}/config.status -e s,^\\\(hardcode_into_libs=\\\).*$,\\1\'no\', ${S}/config.status
}

Quoted 3 lines

Any preference? Aside from I think we should be internally consistent in these fixes, so long as it's fixed...

after testing this one, it doesn't work for shadow (angstrom 2008.1 , armv5 target).

And poky's shadow is not fixed for rpath :
http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/recipes-extended/shadow/shadow.inc

Eric