[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
CVS libtool-branch-2-0 - patch to remove extraneous code in temp_rpath c
From: |
Bob Friesenhahn |
Subject: |
CVS libtool-branch-2-0 - patch to remove extraneous code in temp_rpath calcs. |
Date: |
Sun, 28 Nov 2004 21:14:03 -0600 (CST) |
The following patch removes code which is no longer needed. Ok to apply?
Bob
Index: ChangeLog
===================================================================
RCS file: /cvsroot/libtool/libtool/ChangeLog,v
retrieving revision 1.1667.2.92
diff -u -r1.1667.2.92 ChangeLog
--- ChangeLog 28 Nov 2004 19:54:24 -0000 1.1667.2.92
+++ ChangeLog 29 Nov 2004 03:14:28 -0000
@@ -1,3 +1,8 @@
+2004-11-28 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-28 Ralf Wildenhues <address@hidden>
* config/ltmain.m4sh (func_mode_link): $dlsymsobj is really
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 29 Nov 2004 03:14:29 -0000
@@ -3517,7 +3517,6 @@
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" ;;
esac
@@ -5498,16 +5497,7 @@
# 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
+ rpath="$rpath$dir:"
done
temp_rpath="$rpath"
fi