Re: HEAD link-order.at fails when hardcode_direct=yes

[Gary V. Vaughan]

Gary V. Vaughan wrote:
> Ralf Wildenhues wrote:
> > Are you volunteering for the backport to branch-1-5 (which has
> > a similar issue) or should I do it?
>
> I'll do the backport.

Okay to commit?

Cheers,
        Gary.
--
Gary V. Vaughan      ())_.  address@hidden,gnu.org}
Research Scientist   ( '/   http://blog.azazil.net
GNU Hacker           / )=   http://trac.azazil.net/projects/libtool
Technical Author   `(_~)_   http://sources.redhat.com/autobook

Index: libtool--release--1.5/ChangeLog
===================================================================
--- libtool--release--1.5.orig/ChangeLog        2006-05-17 17:51:57.000000000 
+0100
+++ libtool--release--1.5/ChangeLog     2006-05-17 17:52:55.000000000 +0100
@@ -1,3 +1,8 @@
+2006-05-17  Albert Chin-A-Young  <address@hidden>
+
+       * tests/link-order.test: Take hardcode_direct into consideration
+       when testing link order.
+
 2006-05-15  Bruno Haible  <address@hidden>,
            Ralf Wildenhues  <address@hidden>
 
Index: libtool--release--1.5/tests/link-order.test
===================================================================
--- libtool--release--1.5.orig/tests/link-order.test    2006-05-17 
17:51:52.000000000 +0100
+++ libtool--release--1.5/tests/link-order.test 2006-05-17 17:52:25.000000000 
+0100
@@ -12,6 +12,10 @@
 
 retcode=0
 
+eval `$libtool --config | $EGREP '^(hardcode_direct|shrext_cmds)='`
+module=no
+eval shared_ext=\"$shrext_cmds\"
+
 rm -rf linkorder.dir
 mkdir linkorder.dir
 top_dir=`pwd`/linkorder.dir
@@ -62,12 +66,24 @@
 *-*-aix* | *-*-interix*) ;; # These systems have different path syntax
 *)
   # Do not error if we do not relink (e.g. static-only systems)
-  if $EGREP relinking $srcdir/stderr; then
-    if $EGREP ' -L.*\/new\/lib -lb -L.*\/old\/lib -lcee' $srcdir/stdout; then 
:; else
-      echo "$0: wrong link order" 1>&2
-      retcode=1
+  case $hardcode_direct in
+  yes)
+    if $EGREP relinking $srcdir/stderr; then
+      if $EGREP " .*\/new\/lib/libb$shared_ext .*\/old\/lib/libcee$shared_ext" 
$srcdir/stdout; then :; else
+        echo "$0: wrong link order" 1>&2
+        retcode=1
+      fi
     fi
-  fi
+    ;;
+  *)
+    if $EGREP relinking $srcdir/stderr; then
+      if $EGREP ' -L.*\/new\/lib -lb -L.*\/old\/lib -lcee' $srcdir/stdout; 
then :; else
+        echo "$0: wrong link order" 1>&2
+        retcode=1
+      fi
+    fi
+    ;;
+  esac
   ;;
 esac