diff options
| author |   Martin Schlemmer <azarah@gentoo.org> | 2002-07-03 19:11:10 +0000 |
|---|---|---|
| committer | Martin Schlemmer <azarah@gentoo.org> | 2002-07-03 19:11:10 +0000 |
| commit | 078f3a530d6ba3a7220a50dce78903a192e0bae3 (patch) | |
| tree | eb12d3d559ec58ab334f629ebd65ae8770ceb487 /sys-devel/libtool/files/1.4.1 | |
| parent | symlinko fixo (diff) | |
| download | historical-078f3a530d6ba3a7220a50dce78903a192e0bae3.tar.gz historical-078f3a530d6ba3a7220a50dce78903a192e0bae3.tar.bz2 historical-078f3a530d6ba3a7220a50dce78903a192e0bae3.zip | |
fix $S still being around in some cases
Diffstat (limited to 'sys-devel/libtool/files/1.4.1')
| -rw-r--r-- | sys-devel/libtool/files/1.4.1/libtool-1.4.1-portage.patch-v6 | 62 |
1 files changed, 62 insertions, 0 deletions
diff --git a/sys-devel/libtool/files/1.4.1/libtool-1.4.1-portage.patch-v6 b/sys-devel/libtool/files/1.4.1/libtool-1.4.1-portage.patch-v6 new file mode 100644 index 000000000000..2d15d2e05676 --- /dev/null +++ b/sys-devel/libtool/files/1.4.1/libtool-1.4.1-portage.patch-v6 @@ -0,0 +1,62 @@ +--- ltmain.sh.orig Wed Apr 3 01:19:37 2002 ++++ ltmain.sh Sun May 26 19:50:52 2002 +@@ -3940,9 +3940,46 @@ + $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 + exit 1 + fi +- newdependency_libs="$newdependency_libs $libdir/$name" ++ # We do not want portage's install root ($D) present. Check only for ++ # this if the .la is being installed. ++ if test "$installed" = yes && test "$D"; then ++ eval mynewdependency_lib="`echo "$libdir/$name" |sed -e "s:$D::g" -e 's://:/:g'`" ++ else ++ mynewdependency_lib="$libdir/$name" ++ fi ++ # Do not add duplicates ++ if test "$mynewdependency_lib"; then ++ if test -z "`echo $newdependency_libs |grep -e "$mynewdependency_lib"`"; then ++ newdependency_libs="$newdependency_libs $mynewdependency_lib" ++ fi ++ fi ++ ;; ++ *) ++ if test "$installed" = yes; then ++ # Rather use S=WORKDIR if our version of portage supports it. ++ # This is because some ebuild (gcc) do not use $S as buildroot. ++ if test "$PWORKDIR"; then ++ S="$PWORKDIR" ++ fi ++ # We do not want portage's build root ($S) present. ++ if test -n "`echo $deplib |grep -e "$S"`" && test "$S"; then ++ mynewdependency_lib="" ++ # We do not want portage's install root ($D) present. ++ elif test -n "`echo $deplib |grep -e "$D"`" && test "$D"; then ++ eval mynewdependency_lib="`echo "$deplib" |sed -e "s:$D::g" -e 's://:/:g'`" ++ else ++ mynewdependency_lib="$deplib" ++ fi ++ else ++ mynewdependency_lib="$deplib" ++ fi ++ # Do not add duplicates ++ if test "$mynewdependency_lib"; then ++ if test -z "`echo $newdependency_libs |grep -e "$mynewdependency_lib"`"; then ++ newdependency_libs="$newdependency_libs $mynewdependency_lib" ++ fi ++ fi + ;; +- *) newdependency_libs="$newdependency_libs $deplib" ;; + esac + done + dependency_libs="$newdependency_libs" +@@ -3975,6 +4005,10 @@ + case $host,$output,$installed,$module,$dlname in + *cygwin*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;; + esac ++ # Do not add duplicates ++ if test "$installed" = yes && test "$D"; then ++ install_libdir="`echo "$install_libdir" |sed -e "s:$D::g" -e 's://:/:g'`" ++ fi + $echo > $output "\ + # $outputname - a libtool library file + # Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP |