jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

libtool: changed ltmain.sh to not add references to $destdir.

Browse source 
It seems that ltmain.sh created libtool archive files with references
to PKGFS_DESTDIR/$pkgname-$version. I just removed them, as they
aren't needed (or at least doesn't seem so).

--HG--
extra : convert_revision : f13c3377a9fe9c5a645d21adffe12f90906094cd
This commit is contained in:
Juan RP 2008-10-06 05:08:33 +02:00
parent efe4616185
commit a888a3357b
1 changed files with 56 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
templates/libtool-fix-ltmain.sh.diff
View file

@ -40,8 +40,8 @@
;;
esac
fi
--- libltdl/config/ltmain.sh.orig 2008-09-07 17:56:33.000000000 +0000
+++ libltdl/config/ltmain.sh 2008-09-28 04:34:38.000000000 +0000
--- libltdl/config/ltmain.sh.orig 2008-09-07 19:56:33.000000000 +0200
+++ libltdl/config/ltmain.sh 2008-10-06 04:21:18.000000000 +0200
@@ -2018,8 +2018,8 @@
# At present, this check doesn't affect windows .dll's that
# are installed into $libdir/../bin (currently, that works fine)
@ -53,6 +53,42 @@
if test -n "$inst_prefix_dir"; then
# Stick the inst_prefix_dir data into the link command.
@@ -5115,7 +5115,7 @@
finalize_deplibs="$deplib $finalize_deplibs"
else
deplibs="$deplib $deplibs"
- test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
+ test "$linkmode" = lib && newdependency_libs="$newdependency_libs"
fi
continue
else # deplib is a libtool library
@@ -5141,7 +5141,7 @@
finalize_deplibs="$deplib $finalize_deplibs"
else
deplibs="$deplib $deplibs"
- test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
+ test "$linkmode" = lib && newdependency_libs="$newdependency_libs"
fi
continue
fi
@@ -5172,7 +5172,7 @@
lib)
deplibs="$deplib $deplibs"
test "$pass" = conv && continue
- newdependency_libs="$deplib $newdependency_libs"
+ newdependency_libs="$newdependency_libs"
func_stripname '-L' '' "$deplib"
newlib_search_path="$newlib_search_path $func_stripname_result"
;;
@@ -5490,7 +5490,7 @@
else
# Need to hardcode shared library paths
# or/and link against static libraries
- newdependency_libs="$deplib $newdependency_libs"
+ newdependency_libs="$newdependency_libs"
fi
if $opt_duplicate_deps ; then
case "$tmp_libs " in
@@ -5717,7 +5717,7 @@
if test -n "$inst_prefix_dir"; then
case $libdir in
@ -82,3 +118,21 @@
;;
esac
fi
@@ -5881,7 +5881,7 @@
# ... and its dependency_libs
tmp_libs=
for deplib in $dependency_libs; do
- newdependency_libs="$deplib $newdependency_libs"
+ newdependency_libs="$newdependency_libs"
if $opt_duplicate_deps ; then
case "$tmp_libs " in
*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
@@ -6449,7 +6449,7 @@
esac
done
if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
- dependency_libs="$temp_xrpath $dependency_libs"
+ dependency_libs="$dependency_libs"
fi
fi