Re: [PATCH] shadow: fix rpath issues

[Tom Rini <tom_rini@mentor.com>]

On 02/18/2011 05:30 AM, Eric Bénard wrote:
> * 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@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).

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...

-- 
Tom Rini
Mentor Graphics Corporation