diff options
author | Mike Frysinger <vapier@gentoo.org> | 2008-04-22 22:53:05 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2008-04-22 22:53:05 +0000 |
commit | 5c52876d857afd2de08a4d0efa8ad4aaf3db09be (patch) | |
tree | 8a3a99afe423a3cdc246f726203d62a13b145bf7 /sys-devel/libtool/files | |
parent | Add some fixes from upstream. (diff) | |
download | gentoo-2-5c52876d857afd2de08a4d0efa8ad4aaf3db09be.tar.gz gentoo-2-5c52876d857afd2de08a4d0efa8ad4aaf3db09be.tar.bz2 gentoo-2-5c52876d857afd2de08a4d0efa8ad4aaf3db09be.zip |
old
(Portage version: 2.2_pre5)
Diffstat (limited to 'sys-devel/libtool/files')
9 files changed, 0 insertions, 434 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 deleted file mode 100644 index 52183aff1e12..000000000000 --- a/sys-devel/libtool/files/1.4.3/libtool-1.4.2-archive-shared.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- 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 - 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-expsym-linux.patch b/sys-devel/libtool/files/1.4.3/libtool-1.4.2-expsym-linux.patch deleted file mode 100644 index 4449e3d4e21e..000000000000 --- a/sys-devel/libtool/files/1.4.3/libtool-1.4.2-expsym-linux.patch +++ /dev/null @@ -1,37 +0,0 @@ - This patch makes -export-symbols and -export-symbols-regex work with - GNU ld. It creates a version script rather than using -retain-symbols-file, - which just selectively strips the library. - ---- libtool-1.4.2/libtool.m4.expsym-linux Fri Aug 23 19:01:55 2002 -+++ libtool-1.4.2/libtool.m4 Sat Aug 24 13:47:10 2002 -@@ -1401,6 +1401,30 @@ - hardcode_shlibpath_var=no - ;; - -+ linux*) -+ if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then -+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ supports_anon_versioning=no -+ case `$LD -v 2>/dev/null` in -+ *\ [01].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 -+ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... -+ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... -+ *\ 2.11.*) ;; # other 2.11 versions -+ *) supports_anon_versioning=yes ;; -+ esac -+ if test $supports_anon_versioning = yes; then -+ archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~ -+cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ -+$echo "local: *; };" >> $output_objdir/$libname.ver~ -+ $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' -+ else -+ $archive_expsym_cmds="$archive_cmds" -+ fi -+ else -+ ld_shlibs=no -+ fi -+ ;; -+ - *) - if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 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 deleted file mode 100644 index 38b44d0c1cd8..000000000000 --- a/sys-devel/libtool/files/1.5.10/libtool-1.5.10-portage.patch +++ /dev/null @@ -1,81 +0,0 @@ -Do not create bogus entries in $dependency_libs or $libdir -with ${D} or ${S} in them. -<azarah@gentoo.org> - (07 April 2002) - -Note that if you update this patch, please update this one as well: - - eclass/ELT-patches/portage/1.4.1 - -The file name can stay 1.4.1, as it will still apply to all versions. Only -when a new version of libtool comes out that it do not apply to, then the -name should be bumped, but the patch content should stay fairly the same. - ---- ltmain.in.orig Wed Apr 3 01:19:37 2002 -+++ ltmain.in Sun May 26 19:50:52 2002 -@@ -3940,9 +3940,53 @@ - $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 - exit 1 - fi -- newdependency_libs="$newdependency_libs $libdir/$name" -+ if test "X$EGREP" = X ; then -+ EGREP=egrep -+ fi -+ # 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"` -+ # We do not want portage's install root ($D) present. -+ my_little_ninja_foo_3=`echo $deplib |$EGREP -e "$D"` -+ if test -n "$my_little_ninja_foo_2" && test "$S"; then -+ mynewdependency_lib="" -+ 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/1.5.14/libtool-1.5.14-egrep.patch b/sys-devel/libtool/files/1.5.14/libtool-1.5.14-egrep.patch deleted file mode 100644 index 175a492554db..000000000000 --- a/sys-devel/libtool/files/1.5.14/libtool-1.5.14-egrep.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- 1/ltmain.in 2005-04-16 16:50:02.000000000 +0200 -+++ 2/ltmain.in 2005-04-16 16:46:46.000000000 +0200 -@@ -39,6 +39,13 @@ - if [ "x$SED" = x ] ; then - SED=sed - fi -+# Same for EGREP, and just to be sure, do LTCC as well -+if test "X$EGREP" = X ; then -+ EGREP=egrep -+fi -+if test "X$LTCC" = X ; then -+ LTCC=${CC-gcc} -+fi - - # The name of this program: - progname=`echo "$progpath" | $SED $basename` diff --git a/sys-devel/libtool/files/1.5.20/libtool-1.5.20-ltmain_sh-max_cmd_len.patch b/sys-devel/libtool/files/1.5.20/libtool-1.5.20-ltmain_sh-max_cmd_len.patch deleted file mode 100644 index d676c2b8defb..000000000000 --- a/sys-devel/libtool/files/1.5.20/libtool-1.5.20-ltmain_sh-max_cmd_len.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- libtool-1.5.20/ltmain.in -+++ libtool-1.5.20/ltmain.in -@@ -136,6 +136,30 @@ - execute_dlfiles= - lo2o="s/\\.lo\$/.${objext}/" - o2lo="s/\\.${objext}\$/.lo/" -+ -+if test -z "$max_cmd_len"; then -+ i=0 -+ testring="ABCD" -+ new_result= -+ -+ # If test is not a shell built-in, we'll probably end up computing a -+ # maximum length that is only half of the actual maximum length, but -+ # we can't tell. -+ while (test "X"`$SHELL $0 --fallback-echo "X$testring" 2>/dev/null` \ -+ = "XX$testring") >/dev/null 2>&1 && -+ new_result=`expr "X$testring" : ".*" 2>&1` && -+ max_cmd_len="$new_result" && -+ test "$i" != 17 # 1/2 MB should be enough -+ do -+ i=`expr $i + 1` -+ testring="$testring$testring" -+ done -+ testring= -+ # Add a significant safety factor because C++ compilers can tack on massive -+ # amounts of additional arguments before passing them to the linker. -+ # It appears as though 1/2 is a usable value. -+ max_cmd_len=`expr $max_cmd_len \/ 2` -+fi - - ##################################### - # Shell function definitions: diff --git a/sys-devel/libtool/files/1.5.6/libtool-1.5.6-ltmain-SED.patch b/sys-devel/libtool/files/1.5.6/libtool-1.5.6-ltmain-SED.patch deleted file mode 100644 index 5cd9251479be..000000000000 --- a/sys-devel/libtool/files/1.5.6/libtool-1.5.6-ltmain-SED.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Nru libtool-1.5.6.old/ltmain.in libtool-1.5.6/ltmain.in ---- libtool-1.5.6.old/ltmain.in 2004-07-08 19:36:35.533628176 -0400 -+++ libtool-1.5.6/ltmain.in 2004-07-08 19:37:50.504230912 -0400 -@@ -33,6 +33,9 @@ - # function. - progpath="$0" - -+# define SED for historic ltconfig's generated by Libtool 1.3 -+test -z "$SED" && SED=sed -+ - # The name of this program: - progname=`echo "$progpath" | $SED $basename` - modename="$progname" diff --git a/sys-devel/libtool/files/libltdl-uclibc.patch b/sys-devel/libtool/files/libltdl-uclibc.patch deleted file mode 100644 index db964e7d3c92..000000000000 --- a/sys-devel/libtool/files/libltdl-uclibc.patch +++ /dev/null @@ -1,144 +0,0 @@ ---- libltdl/acinclude.m4.libltdl~ Fri Jun 11 08:53:40 2004 -+++ libltdl/acinclude.m4 Fri Jun 11 08:54:58 2004 -@@ -777,7 +777,7 @@ - - # Transform linux* to *-*-linux-gnu*, to support old configure scripts. - case $host_os in --linux-gnu*) ;; -+linux-gnu*|linux-uclibc*) ;; - linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'` - esac - -@@ -2212,6 +2212,24 @@ - sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" - ;; - -+linux-uclibc*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' -+ soname_spec='${libname}${release}.so$major' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ # This implies no fast_install, which is unacceptable. -+ # Some rework will be needed to allow for fast_install -+ # before this can be enabled. -+ # Note: copied from linux-gnu, and may not be appropriate. -+ hardcode_into_libs=yes -+ # Assume using the uClibc dynamic linker. -+ dynamic_linker="uClibc ld.so" -+ ;; -+ - netbsd*) - version_type=sunos - need_lib_prefix=no -@@ -3434,6 +3452,11 @@ - lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` - ;; - -+linux-uclibc*) -+ lt_cv_deplibs_check_method=pass_all -+ lt_cv_file_magic_test_file=`echo /lib/libuClibc*.so` -+ ;; -+ - netbsd*) - if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then - lt_cv_deplibs_check_method='match_pattern /lib[[^/\.]]+\.so\.[[0-9]]+\.[[0-9]]+$' ---- libltdl/aclocal.m4.libltdl~ Fri Jun 11 08:53:50 2004 -+++ libltdl/aclocal.m4 Fri Jun 11 08:55:33 2004 -@@ -767,7 +767,7 @@ - - # Transform linux* to *-*-linux-gnu*, to support old configure scripts. - case $host_os in --linux-gnu*) ;; -+linux-gnu*|linux-uclibc*) ;; - linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'` - esac - -@@ -2144,6 +2144,24 @@ - dynamic_linker='GNU/Linux ld.so' - ;; - -+linux-uclibc*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' -+ soname_spec='${libname}${release}.so$major' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ # This implies no fast_install, which is unacceptable. -+ # Some rework will be needed to allow for fast_install -+ # before this can be enabled. -+ # Note: copied from linux-gnu, and may not be appropriate. -+ hardcode_into_libs=yes -+ # Assume using the uClibc dynamic linker. -+ dynamic_linker="uClibc ld.so" -+ ;; -+ - netbsd*) - version_type=sunos - need_lib_prefix=no -@@ -3344,6 +3362,11 @@ - lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` - ;; - -+linux-uclibc*) -+ lt_cv_deplibs_check_method=pass_all -+ lt_cv_file_magic_test_file=`echo /lib/libuClibc*.so` -+ ;; -+ - netbsd*) - if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then - lt_cv_deplibs_check_method='match_pattern /lib[[^/\.]]+\.so\.[[0-9]]+\.[[0-9]]+$' ---- libltdl/configure.libltdl~ Fri Jun 11 08:54:04 2004 -+++ libltdl/configure Fri Jun 11 08:56:33 2004 -@@ -1978,6 +1978,11 @@ - lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` - ;; - -+linux-uclibc*) -+ lt_cv_deplibs_check_method=pass_all -+ lt_cv_file_magic_test_file=`echo /lib/libuClibc*.so` -+ ;; -+ - netbsd*) - if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then - lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$' -@@ -3030,7 +3035,7 @@ - - # Transform linux* to *-*-linux-gnu*, to support old configure scripts. - case $host_os in --linux-gnu*) ;; -+linux-gnu*|linux-uclibc*) ;; - linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'` - esac - -@@ -4504,6 +4509,24 @@ - dynamic_linker='GNU/Linux ld.so' - ;; - -+linux-uclibc*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' -+ soname_spec='${libname}${release}.so$major' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ # This implies no fast_install, which is unacceptable. -+ # Some rework will be needed to allow for fast_install -+ # before this can be enabled. -+ # Note: copied from linux-gnu, and may not be appropriate. -+ hardcode_into_libs=yes -+ # Assume using the uClibc dynamic linker. -+ dynamic_linker="uClibc ld.so" -+ ;; -+ - netbsd*) - version_type=sunos - need_lib_prefix=no diff --git a/sys-devel/libtool/files/libtool-2.2.2-AC_ENABLE_SHARED.patch b/sys-devel/libtool/files/libtool-2.2.2-AC_ENABLE_SHARED.patch deleted file mode 100644 index 6b13eb94ae38..000000000000 --- a/sys-devel/libtool/files/libtool-2.2.2-AC_ENABLE_SHARED.patch +++ /dev/null @@ -1,59 +0,0 @@ -commit 1006ccc48c14d3715c569cca68dab54742207273 -Author: Andreas Schwab <schwab@suse.de> -Date: Fri Apr 18 23:43:19 2008 +0200 - - Properly emulate AC_ENABLE_SHARED([no]) and others. - - * libltdl/m4/ltoptions.m4 (AC_ENABLE_SHARED): Check optional - argument. - (AC_ENABLE_STATIC): Likewise. - (AC_ENABLE_FAST_INSTALL): Likewise. - - Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de> - -diff --git a/ChangeLog b/ChangeLog -index 268e369..e593406 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -1,3 +1,10 @@ -+2008-04-18 Andreas Schwab <schwab@suse.de> -+ -+ * libltdl/m4/ltoptions.m4 (AC_ENABLE_SHARED): Check optional -+ argument. -+ (AC_ENABLE_STATIC): Likewise. -+ (AC_ENABLE_FAST_INSTALL): Likewise. -+ - 2008-04-16 Eric Blake <ebb9@byu.net> - - Make ChangeLog merges easier. -diff --git a/libltdl/m4/ltoptions.m4 b/libltdl/m4/ltoptions.m4 -index a1c3aba..339d6f5 100644 ---- a/libltdl/m4/ltoptions.m4 -+++ b/libltdl/m4/ltoptions.m4 -@@ -192,7 +192,7 @@ LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])]) - - # Old names: - AC_DEFUN([AC_ENABLE_SHARED], --[_LT_SET_OPTION([LT_INIT], [shared]) -+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared]) - ]) - - AC_DEFUN([AC_DISABLE_SHARED], -@@ -246,7 +246,7 @@ LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])]) - - # Old names: - AC_DEFUN([AC_ENABLE_STATIC], --[_LT_SET_OPTION([LT_INIT], [static]) -+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static]) - ]) - - AC_DEFUN([AC_DISABLE_STATIC], -@@ -300,7 +300,7 @@ LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no - - # Old names: - AU_DEFUN([AC_ENABLE_FAST_INSTALL], --[_LT_SET_OPTION([LT_INIT], [fast-install]) -+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install]) - AC_DIAGNOSE([obsolete], - [$0: Remove this warning and the call to _LT_SET_OPTION when you put - the `fast-install' option into LT_INIT's first parameter.]) diff --git a/sys-devel/libtool/files/ltconfig-uclibc.patch b/sys-devel/libtool/files/ltconfig-uclibc.patch deleted file mode 100644 index d56a2893fa84..000000000000 --- a/sys-devel/libtool/files/ltconfig-uclibc.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- binutils-2.15.90.0.1.1/ltconfig.uclibc 2004-01-14 22:07:42.000000000 +0100 -+++ binutils-2.15.90.0.1.1/ltconfig 2004-03-10 15:43:37.000000000 +0100 -@@ -603,6 +603,7 @@ - # Transform linux* to *-*-linux-gnu*, to support old configure scripts. - case $host_os in - linux-gnu*) ;; -+linux-uclibc*) ;; - linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'` - esac - -@@ -1259,6 +1260,24 @@ - dynamic_linker='GNU/Linux ld.so' - ;; - -+linux-uclibc*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' -+ soname_spec='${libname}${release}.so$major' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ # This implies no fast_install, which is unacceptable. -+ # Some rework will be needed to allow for fast_install -+ # before this can be enabled. -+ # Note: copied from linux-gnu, and may not be appropriate. -+ hardcode_into_libs=yes -+ # Assume using the uClibc dynamic linker. -+ dynamic_linker="uClibc ld.so" -+ ;; -+ - netbsd*) - need_lib_prefix=no - need_version=no |