libtool-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: wrapper rpath proposed fix


From: Bob Friesenhahn
Subject: Re: wrapper rpath proposed fix
Date: Sun, 28 Nov 2004 12:14:26 -0600 (CST)

On Sun, 28 Nov 2004, Peter O'Gorman wrote:

Bob Friesenhahn wrote:

Assuming that you have verified that it fixes your problem, yes, please do.


Yes, it does fix this problem and the libtool tests still pass.

Okay, then the 47-peter-pass_new_tests.patch can be reverted in HEAD, this was applied to HEAD as a partial fix for the problem, but was never applied to branch_2_0. Since branch_2_0 now works for you, this patch is superfluous.

I guess?

I was not able to find your proposed patch in the libtool-patches archives, but this seems to be your patch:

Index: ChangeLog
===================================================================
RCS file: /cvsroot/libtool/libtool/ChangeLog,v
retrieving revision 1.1710
retrieving revision 1.1711
diff -u -r1.1710 -r1.1711
--- ChangeLog   22 Oct 2004 18:05:29 -0000      1.1710
+++ ChangeLog   23 Oct 2004 12:04:34 -0000      1.1711
@@ -1,3 +1,10 @@
+2004-10-23  Peter O'Gorman  <address@hidden>
+
+       * config/ltmain.m4sh (func_mode_link): Make Gary's new tests
+       pass. When the output wrapper script is not in the current
+       directory, we can not use an rpath which is relative to the
+       current directory. Use an absolute path instead.
+
 2004-10-22  Gary V. Vaughan  <address@hidden>

        * clcommit.m4sh: Add --rcfile option.
@@ -2997,4 +3004,4 @@

 Continued in ChangeLog.2003

-       $Revision: 1.1710 $ $Date: 2004/10/22 18:05:29 $
+       $Revision: 1.1711 $ $Date: 2004/10/23 12:04:34 $
Index: config/ltmain.m4sh
===================================================================
RCS file: /cvsroot/libtool/libtool/config/ltmain.m4sh,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- config/ltmain.m4sh  20 Oct 2004 08:45:10 -0000      1.12
+++ config/ltmain.m4sh  23 Oct 2004 12:04:34 -0000      1.13
@@ -5495,7 +5495,17 @@
            ;;
          *)
            # Relative path: add a thisdir entry.
-           rpath="$rpath\$thisdir/$dir:"
+               case "$output" in
+               *[[\\/]]*)
+                 # the output file is not in the current dir
+                 # so we need an absolute path.
+                 absdir=`cd "$dir" && pwd`
+                 rpath="$rpath$absdir:"
+                 ;;
+               *)
+                 rpath="$rpath\$thisdir/$dir:"
+             ;;
+           esac
            ;;
          esac
        done

The temp_rpath variable now contains only fully-qualified paths, so I think that the chunk of code which tries to fully-qualify paths can be deleted. I will post proposed patches later today.

Bob
======================================
Bob Friesenhahn
address@hidden
http://www.simplesystems.org/users/bfriesen




reply via email to

[Prev in Thread] Current Thread [Next in Thread]