From: Ralf Wildenhues Date: Sun, 7 Jun 2009 07:01:12 +0000 (+0200) Subject: Don't pick up double-quotes from /etc/ld.so.conf on Ubuntu. X-Git-Tag: v2.2.7b~86 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e3095b37d09aa637c465b3099781bf5d69f9f059;p=thirdparty%2Flibtool.git Don't pick up double-quotes from /etc/ld.so.conf on Ubuntu. * libltdl/m4/libtool.m4 (_LT_SYS_DYNAMIC_LINKER) [ linux ] : Remove embedded double quotes from paths picked up from /etc/ld.so.conf. Fixes libltdl compile failure on Ubuntu 7.10. * THANKS: Update. Report by Camilo La Rota. Signed-off-by: Ralf Wildenhues --- diff --git a/ChangeLog b/ChangeLog index e278549b0..822071200 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2009-06-07 Ralf Wildenhues + + Don't pick up double-quotes from /etc/ld.so.conf on Ubuntu. + * libltdl/m4/libtool.m4 (_LT_SYS_DYNAMIC_LINKER) [ linux ] + : Remove embedded double quotes from + paths picked up from /etc/ld.so.conf. Fixes libltdl compile + failure on Ubuntu 7.10. + * THANKS: Update. + Report by Camilo La Rota. + 2009-06-06 Richard Sandiford Fix GNU nm invocation for AIX. diff --git a/THANKS b/THANKS index 9bf16db90..51c99cc30 100644 --- a/THANKS +++ b/THANKS @@ -76,6 +76,7 @@ Brad Smith brad@comstyle.com Brian Barrett brbarret@osl.iu.edu Bruno Haible haible@ilog.fr + Camilo La Rota camilo.larota@ens-lyon.fr Carl D. Roth roth@cse.ucsc.edu Chris P. Ross cross@eng.us.uu.net Christian Biesinger cbiesinger@web.de diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4 index a7d9bf507..0670980a2 100644 --- a/libltdl/m4/libtool.m4 +++ b/libltdl/m4/libtool.m4 @@ -2416,7 +2416,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi