add ELT-patches from Prefix, bug #301190

35 files changed, 533 insertions, 0 deletions

diff --git a/eclass/ELT-patches/aixrtl/1.4.0d-Ggcc b/eclass/ELT-patches/aixrtl/1.4.0d-Ggcc
new file mode 100644
index 000000000000..14cfa29c4053
--- /dev/null
+++ b/eclass/ELT-patches/aixrtl/1.4.0d-Ggcc
@@ -0,0 +1,10 @@
+--- configure
++++ configure
+@@ -4657,6 +4657,7 @@
+ 	  fi
+ 	esac
+ 	shared_flag='-shared'
++	shared_flag="$shared_flag "'${wl}-G'
+       else
+ 	# not using gcc
+ 	if test "$host_cpu" = ia64; then
diff --git a/eclass/ELT-patches/aixrtl/1.4.0d-Ggxx b/eclass/ELT-patches/aixrtl/1.4.0d-Ggxx
new file mode 100644
index 000000000000..4a54cf3c9c72
--- /dev/null
+++ b/eclass/ELT-patches/aixrtl/1.4.0d-Ggxx
@@ -0,0 +1,10 @@
+--- configure
++++ configure
+@@ -4657,6 +4657,7 @@
+	fi
+      esac
+      shared_flag='-shared'
++      shared_flag="$shared_flag "'${wl}-G'
+    else
+      # not using gcc
+      if test "$host_cpu" = ia64; then
diff --git a/eclass/ELT-patches/aixrtl/1.4.0d-Gxlc b/eclass/ELT-patches/aixrtl/1.4.0d-Gxlc
new file mode 100644
index 000000000000..979d52ae241c
--- /dev/null
+++ b/eclass/ELT-patches/aixrtl/1.4.0d-Gxlc
@@ -0,0 +1,11 @@
+--- configure
++++ configure
+@@ -4664,7 +4664,7 @@
+   	# chokes on -Wl,-G. The following line is correct:
+ 	  shared_flag='-G'
+ 	else
+-  	if test "$aix_use_runtimelinking" = yes; then
++  	if true || test "$aix_use_runtimelinking" = yes; then
+ 	    shared_flag='${wl}-G'
+ 	  else
+ 	    shared_flag='${wl}-bM:SRE'
diff --git a/eclass/ELT-patches/aixrtl/1.4.0d-Gxlcxx b/eclass/ELT-patches/aixrtl/1.4.0d-Gxlcxx
new file mode 100644
index 000000000000..3556ea9ab708
--- /dev/null
+++ b/eclass/ELT-patches/aixrtl/1.4.0d-Gxlcxx
@@ -0,0 +1,11 @@
+--- configure
++++ configure
+@@ -2494,7 +2494,7 @@
+ 	# chokes on -Wl,-G. The following line is correct:
+ 	shared_flag='-G'
+       else
+-	if test "$aix_use_runtimelinking" = yes; then
++	if true || test "$aix_use_runtimelinking" = yes; then
+ 	  shared_flag='${wl}-G'
+ 	else
+ 	  shared_flag='${wl}-bM:SRE'
diff --git a/eclass/ELT-patches/aixrtl/1.4.0d-ifc b/eclass/ELT-patches/aixrtl/1.4.0d-ifc
new file mode 100644
index 000000000000..f2a687bd9862
--- /dev/null
+++ b/eclass/ELT-patches/aixrtl/1.4.0d-ifc
@@ -0,0 +1,11 @@
+--- configure
++++ configure
+@@ -2444,7 +2444,7 @@
+       case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
+ 	for ld_flag in $LDFLAGS; do
+ 	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+-	    aix_use_runtimelinking=yes
++#	    aix_use_runtimelinking=yes
+ 	    break
+ 	  fi
+ 	done
diff --git a/eclass/ELT-patches/aixrtl/1.4.0d-ifcxx b/eclass/ELT-patches/aixrtl/1.4.0d-ifcxx
new file mode 100644
index 000000000000..75caac48b6dc
--- /dev/null
+++ b/eclass/ELT-patches/aixrtl/1.4.0d-ifcxx
@@ -0,0 +1,11 @@
+--- configure
++++ configure
+@@ -4614,7 +4614,7 @@
+ 	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
+ 	  for ld_flag in $LDFLAGS; do
+   	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+-  	    aix_use_runtimelinking=yes
++# 	    aix_use_runtimelinking=yes
+   	    break
+   	  fi
+ 	  done
diff --git a/eclass/ELT-patches/aixrtl/1.4.3-casecxx b/eclass/ELT-patches/aixrtl/1.4.3-casecxx
new file mode 100644
index 000000000000..23c786e9d481
--- /dev/null
+++ b/eclass/ELT-patches/aixrtl/1.4.3-casecxx
@@ -0,0 +1,11 @@
+--- configure
++++ configure
+@@ -1466,7 +1466,7 @@
+ 	for ld_flag in $LDFLAGS; do
+ 	  case $ld_flag in
+ 	  *-brtl*)
+-	    aix_use_runtimelinking=yes
++#	    aix_use_runtimelinking=yes
+ 	    break
+ 	  ;;
+ 	  esac
diff --git a/eclass/ELT-patches/aixrtl/1.4.3-needversion b/eclass/ELT-patches/aixrtl/1.4.3-needversion
new file mode 100644
index 000000000000..c5c3b8cd9995
--- /dev/null
+++ b/eclass/ELT-patches/aixrtl/1.4.3-needversion
@@ -0,0 +1,11 @@
+--- configure
++++ configure
+@@ -1964,7 +1964,7 @@
+ aix4* | aix5*)
+   version_type=linux
+   need_lib_prefix=no
+-  need_version=no
++  need_version=yes
+   hardcode_into_libs=yes
+   if test "$host_cpu" = ia64; then
+     # AIX 5 supports IA64
diff --git a/eclass/ELT-patches/aixrtl/1.5.00-casertl b/eclass/ELT-patches/aixrtl/1.5.00-casertl
new file mode 100644
index 000000000000..d035ea82b6a9
--- /dev/null
+++ b/eclass/ELT-patches/aixrtl/1.5.00-casertl
@@ -0,0 +1,11 @@
+--- configure.aixrtl	2007-04-03 11:08:36 +0200
++++ configure	2007-04-03 11:13:25 +0200
+@@ -15941,7 +15941,7 @@
+ 	for ld_flag in $LDFLAGS; do
+ 	  case $ld_flag in
+ 	  *-brtl*)
+-	    aix_use_runtimelinking=yes
++#	    aix_use_runtimelinking=yes
+ 	    break
+ 	    ;;
+ 	  esac
diff --git a/eclass/ELT-patches/aixrtl/1.5.12-Ggcc b/eclass/ELT-patches/aixrtl/1.5.12-Ggcc
new file mode 100644
index 000000000000..f8954fa4d55a
--- /dev/null
+++ b/eclass/ELT-patches/aixrtl/1.5.12-Ggcc
@@ -0,0 +1,11 @@
+--- configure
++++ configure
+@@ -5402,7 +5402,7 @@
+ 	  fi
+ 	esac
+ 	shared_flag='-shared'
+- 	if test "$aix_use_runtimelinking" = yes; then
++	if true || test "$aix_use_runtimelinking" = yes; then
+ 	  shared_flag="$shared_flag "'${wl}-G'
+ 	fi
+       else
diff --git a/eclass/ELT-patches/aixrtl/1.5.12-Ggxx b/eclass/ELT-patches/aixrtl/1.5.12-Ggxx
new file mode 100644
index 000000000000..90017a359e01
--- /dev/null
+++ b/eclass/ELT-patches/aixrtl/1.5.12-Ggxx
@@ -0,0 +1,11 @@
+--- configure
++++ configure
+@@ -2796,7 +2796,7 @@
+ 	fi
+       esac
+       shared_flag='-shared'
+-      if test "$aix_use_runtimelinking" = yes; then
++      if true || test "$aix_use_runtimelinking" = yes; then
+ 	shared_flag="$shared_flag "'${wl}-G'
+       fi
+     else
diff --git a/eclass/ELT-patches/aixrtl/1.5.22-Ggcc b/eclass/ELT-patches/aixrtl/1.5.22-Ggcc
new file mode 100644
index 000000000000..798b3b71e2c3
--- /dev/null
+++ b/eclass/ELT-patches/aixrtl/1.5.22-Ggcc
@@ -0,0 +1,11 @@
+--- configure
++++ configure
+@@ -5726,7 +5726,7 @@
+ 	  ;;
+ 	esac
+ 	shared_flag='-shared'
+-	if test "$aix_use_runtimelinking" = yes; then
++	if true || test "$aix_use_runtimelinking" = yes; then
+ 	  shared_flag="$shared_flag "'${wl}-G'
+ 	fi
+       else
diff --git a/eclass/ELT-patches/aixrtl/1.5.22-Ggxx b/eclass/ELT-patches/aixrtl/1.5.22-Ggxx
new file mode 100644
index 000000000000..10f3ccc122c4
--- /dev/null
+++ b/eclass/ELT-patches/aixrtl/1.5.22-Ggxx
@@ -0,0 +1,11 @@
+--- configure
++++ configure
+@@ -2932,7 +2932,7 @@
+ 	;;
+       esac
+       shared_flag='-shared'
+-      if test "$aix_use_runtimelinking" = yes; then
++      if true || test "$aix_use_runtimelinking" = yes; then
+ 	shared_flag="$shared_flag "'${wl}-G'
+       fi
+     else
diff --git a/eclass/ELT-patches/aixrtl/1.5.22-Gxlc b/eclass/ELT-patches/aixrtl/1.5.22-Gxlc
new file mode 100644
index 000000000000..73e88e82f0aa
--- /dev/null
+++ b/eclass/ELT-patches/aixrtl/1.5.22-Gxlc
@@ -0,0 +1,11 @@
+--- configure
++++ configure
+@@ -12902,7 +12902,7 @@
+   	# chokes on -Wl,-G. The following line is correct:
+ 	  shared_flag='-G'
+ 	else
+-	  if test "$aix_use_runtimelinking" = yes; then
++	  if true || test "$aix_use_runtimelinking" = yes; then
+ 	    shared_flag='${wl}-G'
+ 	  else
+ 	    shared_flag='${wl}-bM:SRE'
diff --git a/eclass/ELT-patches/aixrtl/1.5.26-needversion b/eclass/ELT-patches/aixrtl/1.5.26-needversion
new file mode 100644
index 000000000000..8d6079fef632
--- /dev/null
+++ b/eclass/ELT-patches/aixrtl/1.5.26-needversion
@@ -0,0 +1,11 @@
+--- configure
++++ configure
+@@ -1371,7 +1371,7 @@
+ aix[[4-9]]*)
+   version_type=linux
+   need_lib_prefix=no
+-  need_version=no
++  need_version=yes
+   hardcode_into_libs=yes
+   if test "$host_cpu" = ia64; then
+     # AIX 5 supports IA64
diff --git a/eclass/ELT-patches/aixrtl/2.1b-Ggxx b/eclass/ELT-patches/aixrtl/2.1b-Ggxx
new file mode 100644
index 000000000000..9b5f0250641a
--- /dev/null
+++ b/eclass/ELT-patches/aixrtl/2.1b-Ggxx
@@ -0,0 +1,11 @@
+--- configure
++++ configure
+@@ -5478,7 +5478,7 @@
+ 	  fi
+           esac
+           shared_flag='-shared'
+-	  if test "$aix_use_runtimelinking" = yes; then
++	  if true || test "$aix_use_runtimelinking" = yes; then
+ 	    shared_flag="$shared_flag "'${wl}-G'
+ 	  fi
+         else
diff --git a/eclass/ELT-patches/aixrtl/2.1b-Gxlc b/eclass/ELT-patches/aixrtl/2.1b-Gxlc
new file mode 100644
index 000000000000..f513019c29af
--- /dev/null
+++ b/eclass/ELT-patches/aixrtl/2.1b-Gxlc
@@ -0,0 +1,11 @@
+--- configure
++++ configure
+@@ -5488,7 +5488,7 @@
+ 	  # chokes on -Wl,-G. The following line is correct:
+ 	  shared_flag='-G'
+           else
+-	    if test "$aix_use_runtimelinking" = yes; then
++	    if true || test "$aix_use_runtimelinking" = yes; then
+ 	      shared_flag='${wl}-G'
+ 	    else
+ 	      shared_flag='${wl}-bM:SRE'
diff --git a/eclass/ELT-patches/aixrtl/2.1b-casecxx b/eclass/ELT-patches/aixrtl/2.1b-casecxx
new file mode 100644
index 000000000000..198432a1d93d
--- /dev/null
+++ b/eclass/ELT-patches/aixrtl/2.1b-casecxx
@@ -0,0 +1,11 @@
+--- configure
++++ configure
+@@ -5431,7 +5431,7 @@
+ 	    for ld_flag in $LDFLAGS; do
+ 	      case $ld_flag in
+ 	      *-brtl*)
+-	        aix_use_runtimelinking=yes
++#	        aix_use_runtimelinking=yes
+ 	        break
+ 	        ;;
+ 	      esac
diff --git a/eclass/ELT-patches/darwin-conf/1.5 b/eclass/ELT-patches/darwin-conf/1.5
new file mode 100644
index 000000000000..25fd3a5f76b6
--- /dev/null
+++ b/eclass/ELT-patches/darwin-conf/1.5
@@ -0,0 +1,11 @@
+--- configure.orig	2009-05-22 12:05:31 +0200
++++ configure	2009-05-22 12:05:39 +0200
+@@ -15461,7 +15461,7 @@
+   soname_spec='${libname}${release}${major}$shared_ext'
+   shlibpath_overrides_runpath=yes
+   shlibpath_var=DYLD_LIBRARY_PATH
+-  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
++  shrext_cmds='`test .$module = .yes && echo .bundle || echo .dylib`'
+   # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
+   if test "$GCC" = yes; then
+     sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
diff --git a/eclass/ELT-patches/darwin-conf/1.5b b/eclass/ELT-patches/darwin-conf/1.5b
new file mode 100644
index 000000000000..ed46f4ae3efb
--- /dev/null
+++ b/eclass/ELT-patches/darwin-conf/1.5b
@@ -0,0 +1,20 @@
+--- configure
++++ configure
+@@ -10570,7 +10570,7 @@
+   soname_spec='${libname}${release}${major}$shared_ext'
+   shlibpath_overrides_runpath=yes
+   shlibpath_var=DYLD_LIBRARY_PATH
+-  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
++  shrext_cmds='`test .$module = .yes && echo .bundle || echo .dylib`'
+ 
+   sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
+   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+@@ -14213,7 +14213,7 @@
+   soname_spec='${libname}${release}${major}$shared_ext'
+   shlibpath_overrides_runpath=yes
+   shlibpath_var=DYLD_LIBRARY_PATH
+-  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
++  shrext_cmds='`test .$module = .yes && echo .bundle || echo .dylib`'
+ 
+   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+   ;;
diff --git a/eclass/ELT-patches/darwin-conf/2.2.4 b/eclass/ELT-patches/darwin-conf/2.2.4
new file mode 100644
index 000000000000..f22aa2d40e7e
--- /dev/null
+++ b/eclass/ELT-patches/darwin-conf/2.2.4
@@ -0,0 +1,16 @@
+--- configure
++++ configure
+@@ -12172,11 +12172,11 @@
+   version_type=darwin
+   need_lib_prefix=no
+   need_version=no
+-  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
++  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+   soname_spec='${libname}${release}${major}$shared_ext'
+   shlibpath_overrides_runpath=yes
+   shlibpath_var=DYLD_LIBRARY_PATH
+-  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
++  shrext_cmds='`test .$module = .yes && echo .bundle || echo .dylib`'
+ 
+   sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
+   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
diff --git a/eclass/ELT-patches/darwin-conf/2.2.6 b/eclass/ELT-patches/darwin-conf/2.2.6
new file mode 100644
index 000000000000..ee22122c0e68
--- /dev/null
+++ b/eclass/ELT-patches/darwin-conf/2.2.6
@@ -0,0 +1,30 @@
+--- configure
++++ configure
+@@ -11455,11 +11455,11 @@
+   version_type=darwin
+   need_lib_prefix=no
+   need_version=no
+-  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
++  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+   soname_spec='${libname}${release}${major}$shared_ext'
+   shlibpath_overrides_runpath=yes
+   shlibpath_var=DYLD_LIBRARY_PATH
+-  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
++  shrext_cmds='`test .$module = .yes && echo .bundle || echo .dylib`'
+ 
+   sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
+   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+@@ -15321,11 +15331,11 @@
+   version_type=darwin
+   need_lib_prefix=no
+   need_version=no
+-  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
++  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+   soname_spec='${libname}${release}${major}$shared_ext'
+   shlibpath_overrides_runpath=yes
+   shlibpath_var=DYLD_LIBRARY_PATH
+-  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
++  shrext_cmds='`test .$module = .yes && echo .bundle || echo .dylib`'
+ 
+   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+   ;;
diff --git a/eclass/ELT-patches/deplibs/1.5 b/eclass/ELT-patches/deplibs/1.5
new file mode 100644
index 000000000000..36c507ade3f3
--- /dev/null
+++ b/eclass/ELT-patches/deplibs/1.5
@@ -0,0 +1,18 @@
+--- libtool.orig	2009-07-15 16:25:32 +0200
++++ libtool	2009-07-15 16:51:56 +0200
+@@ -3319,7 +3319,14 @@
+ 		  ;;
+ 		esac
+ 		if grep "^installed=no" $deplib > /dev/null; then
+-		  path="$absdir/$objdir"
++		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
++		  eval library_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
++		  for library_name in ${library_names}; do :; done
++		  if test $mode = relink && test -f "${inst_prefix_dir}${libdir}/${library_name}"; then
++		     path="${inst_prefix_dir}${libdir}"
++		  else
++		    path="$absdir/$objdir"
++		  fi
+ 		else
+ 		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+ 		  if test -z "$libdir"; then
diff --git a/eclass/ELT-patches/deplibs/2.1b b/eclass/ELT-patches/deplibs/2.1b
new file mode 100644
index 000000000000..3df590df7f68
--- /dev/null
+++ b/eclass/ELT-patches/deplibs/2.1b
@@ -0,0 +1,18 @@
+--- ltmain-release-2-1b.in	2009-06-22 15:33:26.000000000 +0200
++++ ltmain-release-2-1b.in.new	2009-07-15 16:59:45.000000000 +0200
+@@ -4946,7 +4946,14 @@
+ 		  fi
+ 		  ;;
+ 		*)
+-		  path="-L$absdir/$objdir"
++		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
++		  eval library_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
++		  for library_name in ${library_names}; do :; done
++		  if test $mode = relink && test -f "${inst_prefix_dir}${libdir}/${library_name}"; then
++		     path="-L${inst_prefix_dir}${libdir}"
++		  else
++		    path="-L$absdir/$objdir"
++		  fi
+ 		  ;;
+ 		esac
+ 		else
diff --git a/eclass/ELT-patches/hardcode-relink/1.3d b/eclass/ELT-patches/hardcode-relink/1.3d
new file mode 100644
index 000000000000..dc7819f447e3
--- /dev/null
+++ b/eclass/ELT-patches/hardcode-relink/1.3d
@@ -0,0 +1,8 @@
+--- ltmain.sh
++++ ltmain.sh
+@@ -2208,4 +2208,4 @@
+ 	    relink)
+-	      if test "$hardcode_direct" = yes; then
++	      if false && test "$hardcode_direct" = yes; then
+ 		add="$dir/$linklib"
+ 	      elif test "$hardcode_minus_L" = yes; then
diff --git a/eclass/ELT-patches/hardcode/1.3d b/eclass/ELT-patches/hardcode/1.3d
new file mode 100644
index 000000000000..7408b372aec7
--- /dev/null
+++ b/eclass/ELT-patches/hardcode/1.3d
@@ -0,0 +1,21 @@
+http://lists.gnu.org/archive/html/bug-libtool/2008-03/msg00124.html
+
+but this patch disables hardcoding independent of inst_prefix_dir at all,
+for both hardcode_direct=yes and hardcode_minus_L=yes.
+
+If you update this patch, please also update libtool/files/libtool-1.3d-hardcode.patch
+
+--- ltmain.in.orig	2008-04-16 15:54:04.000000000 +0200
++++ ltmain.in	2008-04-16 16:21:04.000000000 +0200
+@@ -1900,9 +1900,9 @@
+ 	    add_dir=
+ 	    add=
+ 	    # Finalize command for both is simple: just hardcode it.
+-	    if test "$hardcode_direct" = yes; then
++	    if false && test "$hardcode_direct" = yes; then
+ 	      add="$libdir/$linklib"
+-	    elif test "$hardcode_minus_L" = yes; then
++	    elif false && test "$hardcode_minus_L" = yes; then
+ 	      add_dir="-L$libdir"
+ 	      add="-l$name"
+ 	    elif test "$hardcode_shlibpath_var" = yes; then
diff --git a/eclass/ELT-patches/hardcode/2.1b b/eclass/ELT-patches/hardcode/2.1b
new file mode 100644
index 000000000000..48571f39379f
--- /dev/null
+++ b/eclass/ELT-patches/hardcode/2.1b
@@ -0,0 +1,36 @@
+Hardcoding library path does not work with DESTDIR installs.
+
+Affects any platform with 'hardcode_direct=yes' or 'hardcode_minus_L=yes'.
+According to libtool.m4 (as of libtool-1.5.26), these are:
+   *-aix*
+   *-hpux9
+   hppa-hpux* (not hppa64 or ia64)
+   *-netbsd
+   *-openbsd
+   *-freebsd
+   *-dragonfly
+   *-newsos6
+   *-os2
+   *-amigaos
+   *-sunos4
+   *-sysv4
+It definitely is required for aix (to support DESTDIR),
+although it should help for others too...
+
+--- ../../libtool.orig	2009-07-16 18:06:59 +0200
++++ ../../libtool	2009-07-16 18:07:45 +0200
+@@ -6298,13 +6298,13 @@
+ 	    add_dir=
+ 	    add=
+ 	    # Finalize command for both is simple: just hardcode it.
+ 	    if test "$hardcode_direct" = yes &&
+ 	       test "$hardcode_direct_absolute" = no; then
+ 	      add="$libdir/$linklib"
+-	    elif test "$hardcode_minus_L" = yes; then
++	    elif false && test "$hardcode_minus_L" = yes; then
+ 	      add_dir="-L$libdir"
+ 	      add="-l$name"
+ 	    elif test "$hardcode_shlibpath_var" = yes; then
+ 	      case :$finalize_shlibpath: in
+ 	      *":$libdir:"*) ;;
+ 	      *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
diff --git a/eclass/ELT-patches/hc-flag-ld/1.5 b/eclass/ELT-patches/hc-flag-ld/1.5
new file mode 100644
index 000000000000..bf88873c8f16
--- /dev/null
+++ b/eclass/ELT-patches/hc-flag-ld/1.5
@@ -0,0 +1,18 @@
+http://lists.gnu.org/archive/html/libtool/2006-01/msg00012.html
+
+--- ltmain.sh.orig	2007-11-19 17:07:34.946648000 +0100
++++ ltmain.sh	2007-11-19 17:07:57.785975000 +0100
+@@ -3915,8 +3915,11 @@
+ 	     test -n "$hardcode_libdirs"; then
+ 	    libdir="$hardcode_libdirs"
+ 	    if test -n "$hardcode_libdir_flag_spec_ld"; then
+-	      eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
+-	    else
++		  case $archive_cmds in
++		  *\$LD*) eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" ;;
++		  *)      eval dep_rpath=\"$hardcode_libdir_flag_spec\" ;;
++		  esac
++		else
+ 	      eval dep_rpath=\"$hardcode_libdir_flag_spec\"
+ 	    fi
+ 	  fi
diff --git a/eclass/ELT-patches/hpux-conf/1.5.22-syslibpath b/eclass/ELT-patches/hpux-conf/1.5.22-syslibpath
new file mode 100644
index 000000000000..27fef4873ead
--- /dev/null
+++ b/eclass/ELT-patches/hpux-conf/1.5.22-syslibpath
@@ -0,0 +1,24 @@
+must not search /usr/local in prefix
+
+--- configure.orig	2007-12-02 19:14:55 +0100
++++ configure	2007-12-02 19:14:59 +0100
+@@ -8920,9 +8920,17 @@
+     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+     soname_spec='${libname}${release}${shared_ext}$major'
+     if test "X$HPUX_IA64_MODE" = X32; then
+-      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
++      if test "$GCC" = yes; then
++        sys_lib_search_path_spec="${sys_lib_search_path_spec} /usr/lib/hpux32"
++      else
++        sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
++      fi
+     else
+-      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
++      if test "$GCC" = yes; then
++        sys_lib_search_path_spec="${sys_lib_search_path_spec} /usr/lib/hpux64"
++      else
++        sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
++      fi
+     fi
+     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+     ;;
diff --git a/eclass/ELT-patches/irix-ltmain/2.2.6 b/eclass/ELT-patches/irix-ltmain/2.2.6
new file mode 100644
index 000000000000..70916377b5e7
--- /dev/null
+++ b/eclass/ELT-patches/irix-ltmain/2.2.6
@@ -0,0 +1,30 @@
+I notice that $EPREFIX/usr/share/libtool/config/ltmain.sh also has this
+stray increment - so I'd assume that this is a bug in libtool (which is
+perhaps trying to fix a deprecated behaviour of old IRIX versions?).
+
+http://bugs.gentoo.org/show_bug.cgi?id=301520
+
+
+--- ltmain.sh.dist	2010-01-19 14:04:22.101603800 +0000
++++ ltmain.sh	2010-01-19 14:08:29.361500240 +0000
+@@ -6225,7 +6225,6 @@ func_mode_link ()
+ 	    current=$func_arith_result
+ 	    age="$number_minor"
+ 	    revision="$number_minor"
+-	    lt_irix_increment=no
+ 	    ;;
+ 	  esac
+ 	  ;;
+@@ -6297,11 +6296,7 @@ func_mode_link ()
+ 	  ;;
+ 
+ 	irix | nonstopux)
+-	  if test "X$lt_irix_increment" = "Xno"; then
+-	    func_arith $current - $age
+-	  else
+-	    func_arith $current - $age + 1
+-	  fi
++	  func_arith $current - $age
+ 	  major=$func_arith_result
+ 
+ 	  case $version_type in
diff --git a/eclass/ELT-patches/mint-conf/2.2.6 b/eclass/ELT-patches/mint-conf/2.2.6
new file mode 100644
index 000000000000..34f2e5f28c59
--- /dev/null
+++ b/eclass/ELT-patches/mint-conf/2.2.6
@@ -0,0 +1,15 @@
+Calculating the max args here takes hours.
+
+--- configure
++++ configure
+@@ -7351,6 +7351,10 @@
+     lt_cv_sys_max_cmd_len=8192;
+     ;;
+ 
++  mint*)
++    lt_cv_sys_max_cmd_len=8192;
++    ;;
++
+   amigaos*)
+     # On AmigaOS with pdksh, this test takes hours, literally.
+     # So we just punt and use a minimum line length of 8192.
diff --git a/eclass/ELT-patches/no-lc/1.3d b/eclass/ELT-patches/no-lc/1.3d
new file mode 100644
index 000000000000..de20b0ceed3c
--- /dev/null
+++ b/eclass/ELT-patches/no-lc/1.3d
@@ -0,0 +1,13 @@
+--- release-1-3d.orig	2009-12-03 17:05:15.608916799 +0100
++++ release-1-3d	2009-12-14 22:01:06.634927600 +0100
+@@ -1035,6 +1035,10 @@
+ 	  esac
+ 	elif test "$arg" = "-lm"; then
+ 	  case $host in
++	  *-*-hpux*)
++	    # Compiler inserts libc in the correct place for threads to work
++	    test "X$arg" = "X-lc" && continue
++	    ;;
+ 	  *-*-cygwin* | *-*-pw32* | *-*-beos*)
+ 	    # These systems don't actually have math library (as such)
+ 	    continue
diff --git a/eclass/ELT-patches/no-lc/1.5.22 b/eclass/ELT-patches/no-lc/1.5.22
new file mode 100644
index 000000000000..786284d49744
--- /dev/null
+++ b/eclass/ELT-patches/no-lc/1.5.22
@@ -0,0 +1,11 @@
+--- release-1-5-22.orig	2009-12-03 17:05:15.605534999 +0100
++++ release-1-5-22	2009-12-14 21:56:58.884956366 +0100
+@@ -1573,7 +1573,7 @@
+ 	    # Causes problems with __ctype
+ 	    test "X$arg" = "X-lc" && continue
+ 	    ;;
+-	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
++	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX* | *-*-hpux*)
+ 	    # Compiler inserts libc in the correct place for threads to work
+ 	    test "X$arg" = "X-lc" && continue
+ 	    ;;
diff --git a/eclass/ELT-patches/relink-prog/1.3d b/eclass/ELT-patches/relink-prog/1.3d
new file mode 100644
index 000000000000..ccb6cb811c51
--- /dev/null
+++ b/eclass/ELT-patches/relink-prog/1.3d
@@ -0,0 +1,24 @@
+--- ltmain.sh
++++ ltmain.sh
+@@ -3203,6 +3203,12 @@
+ 		    add_dir="$add_dir -L$inst_prefix_dir$libdir"
+ 		    ;;
+ 		esac
++	      else
++		case $libdir in
++		  [\\/]*)
++		    add_dir="$add_dir -L\\\"\\\${D}\\\"$libdir"
++		    ;;
++		esac
+ 	      fi
+ 	      add="-l$name"
+ 	    fi
+@@ -6630,7 +6636,7 @@
+ 	      esac
+ 	    fi
+ 	    libfile="$libdir/"`$echo "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
+-	    if test -n "$libdir" && test ! -f "$libfile"; then
++	    if test -n "$libdir" && test ! -f "${D}$libfile"; then
+ 	      $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2
+ 	      finalize=no
+ 	    fi
diff --git a/eclass/ELT-patches/relink-prog/2.1b b/eclass/ELT-patches/relink-prog/2.1b
new file mode 100644
index 000000000000..71a0970d5b49
--- /dev/null
+++ b/eclass/ELT-patches/relink-prog/2.1b
@@ -0,0 +1,24 @@
+--- ltmain-v2.2.6.in	2009-06-22 15:33:27.000000000 +0200
++++ ltmain-v2.2.6.in.new	2009-07-16 16:21:04.000000000 +0200
+@@ -1742,7 +1742,7 @@
+ 	      func_source "$lib"
+ 	    fi
+ 	    libfile="$libdir/"`$ECHO "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
+-	    if test -n "$libdir" && test ! -f "$libfile"; then
++	    if test -n "$libdir" && test ! -f "${D}$libfile"; then
+ 	      func_warning "\`$lib' has not been installed in \`$libdir'"
+ 	      finalize=no
+ 	    fi
+@@ -5351,6 +5351,12 @@
+ 		    add_dir="$add_dir -L$inst_prefix_dir$libdir"
+ 		    ;;
+ 		esac
++	      else
++		case $libdir in
++		  [\\/]*)
++		    add_dir="$add_dir -L\\\"\\\${D}\\\"$libdir"
++		    ;;
++		esac
+ 	      fi
+ 	      add="-l$name"
+ 	    fi