From a2890fa0aeb77ffd4b94103e0a32f15029cd8f55 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Wed, 22 Dec 2004 20:05:11 +0000 Subject: [PATCH] psm: also need to touchup libiberty/configure now --- .../2.15.94.0.2/100-uclibc-conf.patch | 77 +++++++++++-------- 1 file changed, 46 insertions(+), 31 deletions(-) diff --git a/toolchain/binutils/2.15.94.0.2/100-uclibc-conf.patch b/toolchain/binutils/2.15.94.0.2/100-uclibc-conf.patch index 15ec4b06c2..dc21386f42 100644 --- a/toolchain/binutils/2.15.94.0.2/100-uclibc-conf.patch +++ b/toolchain/binutils/2.15.94.0.2/100-uclibc-conf.patch @@ -1,6 +1,6 @@ diff -ur binutils-2.15.94.0.2.orig/bfd/config.bfd binutils-2.15.94.0.2/bfd/config.bfd ---- binutils-2.15.94.0.2.orig/bfd/config.bfd 2004-11-22 21:29:57.791886144 -0500 -+++ binutils-2.15.94.0.2/bfd/config.bfd 2004-11-22 21:30:53.195463520 -0500 +--- binutils-2.15.94.0.2.orig/bfd/config.bfd 2004-12-22 15:00:57.219024360 -0500 ++++ binutils-2.15.94.0.2/bfd/config.bfd 2004-12-22 15:01:18.982715776 -0500 @@ -140,7 +140,7 @@ targ_defvec=ecoffalpha_little_vec targ_selvecs=bfd_elf64_alpha_vec @@ -133,8 +133,8 @@ diff -ur binutils-2.15.94.0.2.orig/bfd/config.bfd binutils-2.15.94.0.2/bfd/confi ;; diff -ur binutils-2.15.94.0.2.orig/bfd/configure binutils-2.15.94.0.2/bfd/configure ---- binutils-2.15.94.0.2.orig/bfd/configure 2004-11-22 21:29:57.794885688 -0500 -+++ binutils-2.15.94.0.2/bfd/configure 2004-11-22 21:31:10.011907032 -0500 +--- binutils-2.15.94.0.2.orig/bfd/configure 2004-12-22 15:00:57.221024056 -0500 ++++ binutils-2.15.94.0.2/bfd/configure 2004-12-22 15:01:18.996713648 -0500 @@ -3583,6 +3583,11 @@ lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` ;; @@ -184,8 +184,8 @@ diff -ur binutils-2.15.94.0.2.orig/bfd/configure binutils-2.15.94.0.2/bfd/config TRAD_HEADER='"hosts/vaxlinux.h"' ;; diff -ur binutils-2.15.94.0.2.orig/bfd/configure.in binutils-2.15.94.0.2/bfd/configure.in ---- binutils-2.15.94.0.2.orig/bfd/configure.in 2004-11-22 21:29:57.794885688 -0500 -+++ binutils-2.15.94.0.2/bfd/configure.in 2004-11-22 21:31:23.225898200 -0500 +--- binutils-2.15.94.0.2.orig/bfd/configure.in 2004-12-22 15:00:57.223023752 -0500 ++++ binutils-2.15.94.0.2/bfd/configure.in 2004-12-22 15:01:18.998713344 -0500 @@ -163,7 +163,7 @@ alpha*-*-freebsd* | alpha*-*-kfreebsd*-gnu) COREFILE='' @@ -223,8 +223,8 @@ diff -ur binutils-2.15.94.0.2.orig/bfd/configure.in binutils-2.15.94.0.2/bfd/con TRAD_HEADER='"hosts/vaxlinux.h"' ;; diff -ur binutils-2.15.94.0.2.orig/binutils/configure binutils-2.15.94.0.2/binutils/configure ---- binutils-2.15.94.0.2.orig/binutils/configure 2004-11-22 21:29:57.923866080 -0500 -+++ binutils-2.15.94.0.2/binutils/configure 2004-11-22 21:31:47.597193200 -0500 +--- binutils-2.15.94.0.2.orig/binutils/configure 2004-12-22 15:00:57.351004296 -0500 ++++ binutils-2.15.94.0.2/binutils/configure 2004-12-22 15:01:19.002712736 -0500 @@ -1575,6 +1575,11 @@ lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` ;; @@ -238,8 +238,8 @@ diff -ur binutils-2.15.94.0.2.orig/binutils/configure binutils-2.15.94.0.2/binut if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$' diff -ur binutils-2.15.94.0.2.orig/configure binutils-2.15.94.0.2/configure ---- binutils-2.15.94.0.2.orig/configure 2004-11-22 21:29:57.902869272 -0500 -+++ binutils-2.15.94.0.2/configure 2004-11-22 21:31:47.601192592 -0500 +--- binutils-2.15.94.0.2.orig/configure 2004-12-22 15:00:57.321008856 -0500 ++++ binutils-2.15.94.0.2/configure 2004-12-22 15:01:19.007711976 -0500 @@ -1352,6 +1352,18 @@ i[3456789]86-*-coff | i[3456789]86-*-elf) noconfigdirs="$noconfigdirs ${libgcj}" @@ -260,8 +260,8 @@ diff -ur binutils-2.15.94.0.2.orig/configure binutils-2.15.94.0.2/configure # The GCC port for glibc1 has no MD_FALLBACK_FRAME_STATE_FOR, so let's # not build java stuff by default. diff -ur binutils-2.15.94.0.2.orig/configure.in binutils-2.15.94.0.2/configure.in ---- binutils-2.15.94.0.2.orig/configure.in 2004-11-22 21:29:57.902869272 -0500 -+++ binutils-2.15.94.0.2/configure.in 2004-11-22 21:31:47.606191832 -0500 +--- binutils-2.15.94.0.2.orig/configure.in 2004-12-22 15:00:57.321008856 -0500 ++++ binutils-2.15.94.0.2/configure.in 2004-12-22 15:01:19.010711520 -0500 @@ -561,6 +561,18 @@ i[[3456789]]86-*-coff | i[[3456789]]86-*-elf) noconfigdirs="$noconfigdirs ${libgcj}" @@ -282,8 +282,8 @@ diff -ur binutils-2.15.94.0.2.orig/configure.in binutils-2.15.94.0.2/configure.i # The GCC port for glibc1 has no MD_FALLBACK_FRAME_STATE_FOR, so let's # not build java stuff by default. diff -ur binutils-2.15.94.0.2.orig/gas/configure binutils-2.15.94.0.2/gas/configure ---- binutils-2.15.94.0.2.orig/gas/configure 2004-11-22 21:29:58.078842520 -0500 -+++ binutils-2.15.94.0.2/gas/configure 2004-11-22 21:34:12.759125232 -0500 +--- binutils-2.15.94.0.2.orig/gas/configure 2004-12-22 15:00:57.461987424 -0500 ++++ binutils-2.15.94.0.2/gas/configure 2004-12-22 15:01:19.019710152 -0500 @@ -3420,6 +3420,11 @@ lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` ;; @@ -373,8 +373,8 @@ diff -ur binutils-2.15.94.0.2.orig/gas/configure binutils-2.15.94.0.2/gas/config sparc-fujitsu-none) fmt=aout ;; sparc-*-elf) fmt=elf ;; diff -ur binutils-2.15.94.0.2.orig/gas/configure.in binutils-2.15.94.0.2/gas/configure.in ---- binutils-2.15.94.0.2.orig/gas/configure.in 2004-11-22 21:29:58.079842368 -0500 -+++ binutils-2.15.94.0.2/gas/configure.in 2004-11-22 21:34:12.763124624 -0500 +--- binutils-2.15.94.0.2.orig/gas/configure.in 2004-12-22 15:00:57.461987424 -0500 ++++ binutils-2.15.94.0.2/gas/configure.in 2004-12-22 15:01:19.022709696 -0500 @@ -202,6 +202,7 @@ alpha*-*-osf*) fmt=ecoff ;; alpha*-*-linuxecoff*) fmt=ecoff ;; @@ -385,7 +385,7 @@ diff -ur binutils-2.15.94.0.2.orig/gas/configure.in binutils-2.15.94.0.2/gas/con @@ -218,6 +219,7 @@ arm-*-linux*aout*) fmt=aout em=linux ;; - arm*-*-linux-gnueabi*) fmt=elf em=armlinuxeabi ;; + arm*-*-linux-gnueabi*) fmt=elf em=armlinuxeabi ;; arm*-*-linux-gnu*) fmt=elf em=linux ;; + arm*-*-linux-uclibc*) fmt=elf em=linux ;; arm*-*-uclinux*) fmt=elf em=linux ;; @@ -452,8 +452,8 @@ diff -ur binutils-2.15.94.0.2.orig/gas/configure.in binutils-2.15.94.0.2/gas/con sparc-fujitsu-none) fmt=aout ;; sparc-*-elf) fmt=elf ;; diff -ur binutils-2.15.94.0.2.orig/gprof/configure binutils-2.15.94.0.2/gprof/configure ---- binutils-2.15.94.0.2.orig/gprof/configure 2004-11-22 21:29:58.628758920 -0500 -+++ binutils-2.15.94.0.2/gprof/configure 2004-11-22 21:34:12.777122496 -0500 +--- binutils-2.15.94.0.2.orig/gprof/configure 2004-12-22 15:00:57.949913248 -0500 ++++ binutils-2.15.94.0.2/gprof/configure 2004-12-22 15:01:19.030708480 -0500 @@ -3418,6 +3418,11 @@ lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` ;; @@ -467,8 +467,8 @@ diff -ur binutils-2.15.94.0.2.orig/gprof/configure binutils-2.15.94.0.2/gprof/co if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$' diff -ur binutils-2.15.94.0.2.orig/ld/configure binutils-2.15.94.0.2/ld/configure ---- binutils-2.15.94.0.2.orig/ld/configure 2004-11-22 21:29:58.752740072 -0500 -+++ binutils-2.15.94.0.2/ld/configure 2004-11-22 21:34:12.784121432 -0500 +--- binutils-2.15.94.0.2.orig/ld/configure 2004-12-22 15:00:58.032900632 -0500 ++++ binutils-2.15.94.0.2/ld/configure 2004-12-22 15:01:19.035707720 -0500 @@ -1579,6 +1579,11 @@ lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` ;; @@ -482,8 +482,8 @@ diff -ur binutils-2.15.94.0.2.orig/ld/configure binutils-2.15.94.0.2/ld/configur if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$' diff -ur binutils-2.15.94.0.2.orig/ld/configure.tgt binutils-2.15.94.0.2/ld/configure.tgt ---- binutils-2.15.94.0.2.orig/ld/configure.tgt 2004-11-22 21:29:58.753739920 -0500 -+++ binutils-2.15.94.0.2/ld/configure.tgt 2004-11-22 21:38:50.336926992 -0500 +--- binutils-2.15.94.0.2.orig/ld/configure.tgt 2004-12-22 15:00:58.033900480 -0500 ++++ binutils-2.15.94.0.2/ld/configure.tgt 2004-12-22 15:01:19.036707568 -0500 @@ -32,6 +32,7 @@ targ_extra_libpath=$targ_extra_emuls ;; cris-*-linux-gnu* | cris-*-linux-gnu*) @@ -628,8 +628,8 @@ diff -ur binutils-2.15.94.0.2.orig/ld/configure.tgt binutils-2.15.94.0.2/ld/conf alpha*-*-gnu*) targ_emul=elf64alpha ;; alpha*-*-netware*) targ_emul=alpha ;; diff -ur binutils-2.15.94.0.2.orig/ld/emultempl/elf32.em binutils-2.15.94.0.2/ld/emultempl/elf32.em ---- binutils-2.15.94.0.2.orig/ld/emultempl/elf32.em 2004-11-22 21:29:58.763738400 -0500 -+++ binutils-2.15.94.0.2/ld/emultempl/elf32.em 2004-11-22 21:38:50.338926688 -0500 +--- binutils-2.15.94.0.2.orig/ld/emultempl/elf32.em 2004-12-22 15:00:58.044898808 -0500 ++++ binutils-2.15.94.0.2/ld/emultempl/elf32.em 2004-12-22 15:01:19.038707264 -0500 @@ -65,7 +65,7 @@ if [ "x${USE_LIBPATH}" = xyes ] ; then @@ -666,9 +666,24 @@ diff -ur binutils-2.15.94.0.2.orig/ld/emultempl/elf32.em binutils-2.15.94.0.2/ld cat >>e${EMULATION_NAME}.c <name, force)) break; +diff -ur binutils-2.15.94.0.2.orig/libiberty/configure binutils-2.15.94.0.2/libiberty/configure +--- binutils-2.15.94.0.2.orig/libiberty/configure 2004-12-22 15:00:59.263713520 -0500 ++++ binutils-2.15.94.0.2/libiberty/configure 2004-12-22 15:03:55.744884304 -0500 +@@ -3682,6 +3682,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* | knetbsd*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then + lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$' diff -ur binutils-2.15.94.0.2.orig/libtool.m4 binutils-2.15.94.0.2/libtool.m4 ---- binutils-2.15.94.0.2.orig/libtool.m4 2004-11-22 21:29:57.000000000 -0500 -+++ binutils-2.15.94.0.2/libtool.m4 2004-11-22 21:38:50.339926536 -0500 +--- binutils-2.15.94.0.2.orig/libtool.m4 2004-12-22 15:00:57.329007640 -0500 ++++ binutils-2.15.94.0.2/libtool.m4 2004-12-22 15:01:19.039707112 -0500 @@ -645,6 +645,11 @@ lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` ;; @@ -682,8 +697,8 @@ diff -ur binutils-2.15.94.0.2.orig/libtool.m4 binutils-2.15.94.0.2/libtool.m4 if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'] diff -ur binutils-2.15.94.0.2.orig/ltconfig binutils-2.15.94.0.2/ltconfig ---- binutils-2.15.94.0.2.orig/ltconfig 2004-11-22 21:29:57.000000000 -0500 -+++ binutils-2.15.94.0.2/ltconfig 2004-11-22 21:38:50.341926232 -0500 +--- binutils-2.15.94.0.2.orig/ltconfig 2004-12-22 15:00:57.330007488 -0500 ++++ binutils-2.15.94.0.2/ltconfig 2004-12-22 15:01:19.041706808 -0500 @@ -603,6 +603,7 @@ # Transform linux* to *-*-linux-gnu*, to support old configure scripts. case $host_os in @@ -718,8 +733,8 @@ diff -ur binutils-2.15.94.0.2.orig/ltconfig binutils-2.15.94.0.2/ltconfig need_lib_prefix=no need_version=no diff -ur binutils-2.15.94.0.2.orig/opcodes/configure binutils-2.15.94.0.2/opcodes/configure ---- binutils-2.15.94.0.2.orig/opcodes/configure 2004-11-22 21:29:59.114685048 -0500 -+++ binutils-2.15.94.0.2/opcodes/configure 2004-11-22 21:38:50.354924256 -0500 +--- binutils-2.15.94.0.2.orig/opcodes/configure 2004-12-22 15:00:59.334702728 -0500 ++++ binutils-2.15.94.0.2/opcodes/configure 2004-12-22 15:01:19.053704984 -0500 @@ -3587,6 +3587,11 @@ lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` ;; -- 2.30.2