diff options
| author |   Martin Schlemmer <azarah@gentoo.org> | 2005-02-23 17:17:01 +0000 |
|---|---|---|
| committer | Martin Schlemmer <azarah@gentoo.org> | 2005-02-23 17:17:01 +0000 |
| commit | 06ba3bdec944013e77e69081a0f5a3fa3143ce4b (patch) | |
| tree | 4001159795026273cb896338442f6aee3854d8dc /sys-devel/libtool/files | |
| parent | Make the ebuild independent of kde. (diff) | |
| download | historical-06ba3bdec944013e77e69081a0f5a3fa3143ce4b.tar.gz historical-06ba3bdec944013e77e69081a0f5a3fa3143ce4b.tar.bz2 historical-06ba3bdec944013e77e69081a0f5a3fa3143ce4b.zip | |
Update portage.patch to verify that we always have a leading '/' when we replace $D.
Package-Manager: portage-2.0.51-r15
Diffstat (limited to 'sys-devel/libtool/files')
| -rw-r--r-- | sys-devel/libtool/files/1.5.10/libtool-1.5.10-portage.patch | 66 | ||||
| -rw-r--r-- | sys-devel/libtool/files/digest-libtool-1.5.10-r5 | 1 |
2 files changed, 67 insertions, 0 deletions
diff --git a/sys-devel/libtool/files/1.5.10/libtool-1.5.10-portage.patch b/sys-devel/libtool/files/1.5.10/libtool-1.5.10-portage.patch new file mode 100644 index 000000000000..7cb831bb250b --- /dev/null +++ b/sys-devel/libtool/files/1.5.10/libtool-1.5.10-portage.patch @@ -0,0 +1,66 @@ +--- ltmain.in.orig Wed Apr 3 01:19:37 2002 ++++ ltmain.in Sun May 26 19:50:52 2002 +@@ -3940,9 +3940,50 @@ + $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 ++ my_little_ninja_foo_1=`echo $newdependency_libs |$EGREP -e "$mynewdependency_lib"` ++ if test -z "$my_little_ninja_foo_1"; 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. ++ my_little_ninja_foo_2=`echo $deplib |$EGREP -e "$S"` ++ if test -n "$my_little_ninja_foo_2" && test "$S"; then ++ mynewdependency_lib="" ++ # We do not want portage's install root ($D) present. ++ my_little_ninja_foo_3=`echo $deplib |$EGREP -e "$D"` ++ elif test -n "$my_little_ninja_foo_3" && 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 ++ my_little_ninja_foo_4=`echo $newdependency_libs |$EGREP -e "$mynewdependency_lib"` ++ if test -z "$my_little_ninja_foo_4"; 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 diff --git a/sys-devel/libtool/files/digest-libtool-1.5.10-r5 b/sys-devel/libtool/files/digest-libtool-1.5.10-r5 new file mode 100644 index 000000000000..cab20e0c9462 --- /dev/null +++ b/sys-devel/libtool/files/digest-libtool-1.5.10-r5 @@ -0,0 +1 @@ +MD5 e2093a85f6d48f1562c36920087502d6 libtool-1.5.10.tar.gz 2699923 |