[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
2.0 branch temp_rpath patch try #2
From: |
Bob Friesenhahn |
Subject: |
2.0 branch temp_rpath patch try #2 |
Date: |
Wed, 1 Dec 2004 20:04:04 -0600 (CST) |
Here is a proposed patch to reduce code related to temp_rpath some
more. Contrary to advice, I decided to leave the variable name
unchanged since there is another similar variable which handles the
static rpath.
Ok to commit?
Index: ChangeLog
===================================================================
RCS file: /cvsroot/libtool/libtool/ChangeLog,v
retrieving revision 1.1667.2.95
diff -u -r1.1667.2.95 ChangeLog
--- ChangeLog 29 Nov 2004 21:11:25 -0000 1.1667.2.95
+++ ChangeLog 2 Dec 2004 02:04:24 -0000
@@ -1,3 +1,8 @@
+2004-12-01 Bob Friesenhahn <address@hidden>
+
+ * config/ltmain.m4sh: Remove code which is no longer needed
+ now that temp_rpath only contains fully-qualified elements.
+
2004-11-29 Ralf Wildenhues <address@hidden>
* m4/libtool.m4 (_LT_LINKER_SHLIBS): Treat linux-dietlibc with
Index: config/ltmain.m4sh
===================================================================
RCS file: /cvsroot/libtool/libtool/config/ltmain.m4sh,v
retrieving revision 1.1.2.23
diff -u -r1.1.2.23 ltmain.m4sh
--- config/ltmain.m4sh 28 Nov 2004 19:54:25 -0000 1.1.2.23
+++ config/ltmain.m4sh 2 Dec 2004 02:04:25 -0000
@@ -3517,9 +3517,8 @@
if test -n "$shlibpath_var"; then
# Make sure the rpath contains only unique directories.
case "$temp_rpath " in
- *" $dir "*) ;;
- *" $absdir "*) ;;
- *) temp_rpath="$temp_rpath $absdir" ;;
+ *"$absdir:"*) ;;
+ *) temp_rpath="$temp_rpath$absdir:" ;;
esac
fi
@@ -5494,24 +5493,6 @@
exit $status
fi
- if test -n "$shlibpath_var"; then
- # We should set the shlibpath_var
- rpath=
- for dir in $temp_rpath; do
- case $dir in
- [[\\/]]* | [[A-Za-z]]:[[\\/]]*)
- # Absolute path.
- rpath="$rpath$dir:"
- ;;
- *)
- # Relative path: add a thisdir entry.
- rpath="$rpath\$thisdir/$dir:"
- ;;
- esac
- done
- temp_rpath="$rpath"
- fi
-
if test -n "$compile_shlibpath$finalize_shlibpath"; then
compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\"
$compile_command"
fi
======================================
Bob Friesenhahn
address@hidden
http://www.simplesystems.org/users/bfriesen
- 2.0 branch temp_rpath patch try #2,
Bob Friesenhahn <=