diff options
| author |   Martin Schlemmer <azarah@gentoo.org> | 2003-09-24 18:14:06 +0000 |
|---|---|---|
| committer | Martin Schlemmer <azarah@gentoo.org> | 2003-09-24 18:14:06 +0000 |
| commit | 490b3e144ea22fd227c2c919298b4205b2953e9f (patch) | |
| tree | 5225a58a98a41c8bc281bd4dec96106f267a30dd /sys-devel/libtool/files | |
| parent | With 1.4.3, we have ltmain.in and ltmain.sh which both got patched, but not (diff) | |
| download | gentoo-2-490b3e144ea22fd227c2c919298b4205b2953e9f.tar.gz gentoo-2-490b3e144ea22fd227c2c919298b4205b2953e9f.tar.bz2 gentoo-2-490b3e144ea22fd227c2c919298b4205b2953e9f.zip | |
With 1.4.3, we have ltmain.in and ltmain.sh which both got patched, but not
with all the patches :/ Fix all the patches to only apply to ltmain.in, and
then fix the breakage that follows due to us having to remove ltmain.sh.
Diffstat (limited to 'sys-devel/libtool/files')
5 files changed, 8 insertions, 26 deletions
diff --git a/sys-devel/libtool/files/1.4.3/libtool-1.4.2-archive-shared.patch b/sys-devel/libtool/files/1.4.3/libtool-1.4.2-archive-shared.patch index 52183b2f0f12..52183aff1e12 100644 --- a/sys-devel/libtool/files/1.4.3/libtool-1.4.2-archive-shared.patch +++ b/sys-devel/libtool/files/1.4.3/libtool-1.4.2-archive-shared.patch @@ -1,5 +1,5 @@ ---- libtool-1.4.2/ltmain.sh.archive-shared 2002-07-15 09:12:03.000000000 -0400 -+++ libtool-1.4.2/ltmain.sh 2002-07-15 09:13:04.000000000 -0400 +--- libtool-1.4.2/ltmain.in.archive-shared 2002-07-15 09:12:03.000000000 -0400 ++++ libtool-1.4.2/ltmain.in 2002-07-15 09:13:04.000000000 -0400 @@ -2644,6 +2644,13 @@ EOF *) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";; esac diff --git a/sys-devel/libtool/files/1.4.3/libtool-1.4.2-fix-linkage-of-cxx-code-with-gcc.patch b/sys-devel/libtool/files/1.4.3/libtool-1.4.2-fix-linkage-of-cxx-code-with-gcc.patch index 7e5b69c74681..a89fef4f324d 100644 --- a/sys-devel/libtool/files/1.4.3/libtool-1.4.2-fix-linkage-of-cxx-code-with-gcc.patch +++ b/sys-devel/libtool/files/1.4.3/libtool-1.4.2-fix-linkage-of-cxx-code-with-gcc.patch @@ -18,23 +18,3 @@ # If this variable is set in any of the actions, the command in it # will be execed at the end. This prevents here-documents from being # left over by shells. ---- ./ltmain.sh.gege 2002-05-15 13:33:49.000000000 +0200 -+++ ./ltmain.sh 2002-05-15 13:36:53.000000000 +0200 -@@ -207,6 +207,17 @@ - exit 1 - fi - -+# Mandrake: (gc) It's bad to link C++ code with GCC, so we need to use the compiler name if provided -+if test "$mode" = link && test -n "$archive_cmds" && test -x "/usr/bin/perl"; then -+ case $nonopt in -+ *cc | *++ | gcc* | *-gcc* | egcs*) -+ archive_cmds=`echo $archive_cmds | perl -pe 's/^\S+\s+//'` -+ archive_cmds="$nonopt $archive_cmds" -+ archive_expsym_cmds=`echo $archive_expsym_cmds | perl -pe 's/^\S+\s+//'` -+ archive_expsym_cmds="$nonopt $archive_expsym_cmds" -+ esac -+fi -+ - # If this variable is set in any of the actions, the command in it - # will be execed at the end. This prevents here-documents from being - # left over by shells. diff --git a/sys-devel/libtool/files/1.4.3/libtool-1.4.2-portage.patch b/sys-devel/libtool/files/1.4.3/libtool-1.4.2-portage.patch index 2d15d2e05676..290d040f6780 100644 --- a/sys-devel/libtool/files/1.4.3/libtool-1.4.2-portage.patch +++ b/sys-devel/libtool/files/1.4.3/libtool-1.4.2-portage.patch @@ -1,5 +1,5 @@ ---- ltmain.sh.orig Wed Apr 3 01:19:37 2002 -+++ ltmain.sh Sun May 26 19:50:52 2002 +--- ltmain.in.orig Wed Apr 3 01:19:37 2002 ++++ ltmain.in Sun May 26 19:50:52 2002 @@ -3940,9 +3940,46 @@ $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 exit 1 diff --git a/sys-devel/libtool/files/1.4.3/libtool-1.4.3-ltmain-SED.patch b/sys-devel/libtool/files/1.4.3/libtool-1.4.3-ltmain-SED.patch index fac977cbd483..f0f907205b55 100644 --- a/sys-devel/libtool/files/1.4.3/libtool-1.4.3-ltmain-SED.patch +++ b/sys-devel/libtool/files/1.4.3/libtool-1.4.3-ltmain-SED.patch @@ -1,5 +1,5 @@ ---- libtool-1.4.3/ltmain.sh.ltmain-SED 2003-02-13 14:54:24.000000000 +0100 -+++ libtool-1.4.3/ltmain.sh 2003-02-13 15:24:49.000000000 +0100 +--- libtool-1.4.3/ltmain.in.ltmain-SED 2003-02-13 14:54:24.000000000 +0100 ++++ libtool-1.4.3/ltmain.in 2003-02-13 15:24:49.000000000 +0100 @@ -48,6 +48,9 @@ EOF exit 0 fi diff --git a/sys-devel/libtool/files/digest-libtool-1.4.3-r2 b/sys-devel/libtool/files/digest-libtool-1.4.3-r2 new file mode 100644 index 000000000000..e1f620300ee1 --- /dev/null +++ b/sys-devel/libtool/files/digest-libtool-1.4.3-r2 @@ -0,0 +1,2 @@ +MD5 d11a3c835449d7fa50a025dc9c01ad81 libtool-1.4.3.tar.gz 1164463 +MD5 fa26a07c978ad05d1f88ed7a472daa49 libtool-1.3.5.tar.gz 538884 |