add some patches to libtool

5 files changed, 118 insertions, 0 deletions

diff --git a/sys-devel/libtool/files/1.4.3/libtool-1.4.2-add-x11r6-lib-in-ignores-for-rpath.patch b/sys-devel/libtool/files/1.4.3/libtool-1.4.2-add-x11r6-lib-in-ignores-for-rpath.patch
new file mode 100644
index 000000000000..7cfba32afb5c
--- /dev/null
+++ b/sys-devel/libtool/files/1.4.3/libtool-1.4.2-add-x11r6-lib-in-ignores-for-rpath.patch
@@ -0,0 +1,13 @@
+--- ./libtool.m4.gege	Tue Sep 11 05:16:01 2001
++++ ./libtool.m4	Sat Oct 20 00:05:20 2001
+@@ -1932,8 +1932,8 @@
+ shlibpath_overrides_runpath=unknown
+ version_type=none
+ dynamic_linker="$host_os ld.so"
+-sys_lib_dlsearch_path_spec="/lib /usr/lib"
+-sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/X11R6/lib"
++sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib /usr/X11R6/lib"
+ 
+ case $host_os in
+ aix3*)
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
new file mode 100644
index 000000000000..52183b2f0f12
--- /dev/null
+++ b/sys-devel/libtool/files/1.4.3/libtool-1.4.2-archive-shared.patch
@@ -0,0 +1,16 @@
+--- 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
+@@ -2644,6 +2644,13 @@ EOF
+ 			*) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
+ 			esac
+ 		      done
++		      # It is ok to link against an archive when
++		      # building a shared library.
++		      if $AR -t $potlib > /dev/null 2>&1; then
++		        newdeplibs="$newdeplibs $a_deplib"
++		        a_deplib=""
++		        break 2
++		      fi
+ 		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \
+ 			 | sed 10q \
+ 			 | egrep "$file_magic_regex" > /dev/null; then
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
new file mode 100644
index 000000000000..7e5b69c74681
--- /dev/null
+++ b/sys-devel/libtool/files/1.4.3/libtool-1.4.2-fix-linkage-of-cxx-code-with-gcc.patch
@@ -0,0 +1,40 @@
+--- ./ltmain.in.gege	2001-09-11 01:40:18.000000000 +0200
++++ ./ltmain.in	2002-05-15 13:32:16.000000000 +0200
+@@ -205,6 +205,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.
+--- ./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.3-lib64.patch b/sys-devel/libtool/files/1.4.3/libtool-1.4.3-lib64.patch
new file mode 100644
index 000000000000..96c5d64e2723
--- /dev/null
+++ b/sys-devel/libtool/files/1.4.3/libtool-1.4.3-lib64.patch
@@ -0,0 +1,37 @@
+--- libtool-1.4.3/libtool.m4.lib64	2003-02-13 14:47:06.000000000 +0100
++++ libtool-1.4.3/libtool.m4	2003-02-13 14:47:06.000000000 +0100
+@@ -100,6 +100,20 @@ case $host in
+   rm -rf conftest*
+   ;;
+ 
++*-*-linux*)
++  # Test if the compiler is 64bit
++  echo 'int i;' > conftest.$ac_ext
++  lt_cv_cc_64bit_output=no
++  if AC_TRY_EVAL(ac_compile); then
++    case `/usr/bin/file conftest.$ac_objext` in
++    *"ELF 64"*)
++      lt_cv_cc_64bit_output=yes
++      ;;
++    esac
++  fi
++  rm -rf conftest*
++  ;;
++  
+ *-*-sco3.2v5*)
+   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+   SAVE_CFLAGS="$CFLAGS"
+@@ -2183,6 +2197,13 @@ linux-gnu*)
+   # before this can be enabled.
+   hardcode_into_libs=yes
+ 
++  case $host_cpu:$lt_cv_cc_64bit_output in
++  powerpc64:yes | s390x:yes | sparc64:yes | x86_64:yes)
++    sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /usr/X11R6/lib64"
++    sys_lib_search_path_spec="/lib64 /usr/lib64 /usr/local/lib64 /usr/X11R6/lib64"
++    ;;
++  esac
++
+   # We used to test for /lib/ld.so.1 and disable shared libraries on
+   # powerpc, because MkLinux only supported shared libraries with the
+   # GNU dynamic linker.  Since this was broken with cross compilers,
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
new file mode 100644
index 000000000000..fac977cbd483
--- /dev/null
+++ b/sys-devel/libtool/files/1.4.3/libtool-1.4.3-ltmain-SED.patch
@@ -0,0 +1,12 @@
+--- 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
+@@ -48,6 +48,9 @@ EOF
+   exit 0
+ fi
+ 
++# define SED for historic ltconfig's generated by Libtool 1.3
++test -z "$SED" && SED=sed
++
+ # The name of this program.
+ progname=`$echo "$0" | ${SED} 's%^.*/%%'`
+ modename="$progname"