linux ld accepts -rpath [libtool--gary--1.0--patch-58]

[Gary V. Vaughan]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

I just noticed that when doing large builds with pkgconfiged dependency
trees linked in using libtool, the -rpath entries are doubled up.  One
from the .pc file, spelled `-Wl,-rpath,/opt/gnome/blah' and another
generated by libtool, spelled `-Wl,--rpath -Wl,/opt/gnome/blah'.  The
double hyphen in libtool's spelling seems wrong to me.  This patch
causes no regressions on my modern Mandrake linux, my powerbook and
two older versions of Redhat.

Okay to commit?

        * m4/libtool.m4 (_LT_LINKER_SHLIBS): Typo: s/--rpath/-rpath/g.
        (_LT_LANG_CXX_CONFIG): Ditto.

- -- 
Gary V. Vaughan      ())_.  address@hidden,gnu.org}
Research Scientist   ( '/   http://tkd.kicks-ass.net
GNU Hacker           / )=   http://www.gnu.org/software/libtool
Technical Author   `(_~)_   http://sources.redhat.com/autobook
_________________________________________________________
This patch notification generated by tlaapply version 0.9
http://tkd.kicks-ass.net/arch/address@hidden/cvs-utils--tla--1.0
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (Darwin)

iD8DBQFBi7OQFRMICSmD1gYRAsf1AJ9xb+ckKkcRhgJBGGk5VfPq+tjlnwCbBV6T
7Gge2qkWHarHVw2gCXSt33o=
=wyxQ
-----END PGP SIGNATURE-----

* looking for address@hidden/libtool--gary--1.0--patch-57 to compare with
* comparing to address@hidden/libtool--gary--1.0--patch-57
M  ChangeLog
M  m4/libtool.m4

* modified files

Index: Changelog
from  Gary V. Vaughan  <address@hidden>

        * m4/libtool.m4 (_LT_LINKER_SHLIBS): Typo: s/--rpath/-rpath/g.
        (_LT_LANG_CXX_CONFIG): Ditto.

--- orig/m4/libtool.m4
+++ mod/m4/libtool.m4
@@ -3642,7 +3642,7 @@
 
     if test "$_LT_TAGVAR(ld_shlibs, $1)" = yes; then
       runpath_var=LD_RUN_PATH
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
       _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
       # ancient GNU ld didn't support --whole-archive et. al.
       if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
@@ -4580,7 +4580,7 @@
         _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects 
$libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o 
$lib'
         _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib 
$predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname 
$wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
         _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
 
         # If archive_cmds runs LD, not CC, wlarc should be empty
@@ -5047,7 +5047,7 @@
            # dependencies.
            output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext 
-o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; 
list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; 
*.$objext);; *) list="$list $z";;esac; done; $ECHO $list'
 
-           _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir'
+           _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
            _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
 
            # Archives containing C++ object files must be created using