diff --git a/packages/toolchain/devel/binutils/patches/01_ld_makefile_patch.diff b/packages/toolchain/devel/binutils/patches/01_ld_makefile_patch.diff deleted file mode 100644 index 5cb0f614d8..0000000000 --- a/packages/toolchain/devel/binutils/patches/01_ld_makefile_patch.diff +++ /dev/null @@ -1,24 +0,0 @@ -diff -u binutils-2.17.50.0.17.oorig/ld/Makefile.am binutils-2.17.50.0.17/ld/Makefile.am ---- binutils-2.17.50.0.17.oorig/ld/Makefile.am 2007-06-18 19:29:29.000000000 +0200 -+++ binutils-2.17.50.0.17/ld/Makefile.am 2007-06-25 10:00:36.000000000 +0200 -@@ -18,7 +18,7 @@ - # We put the scripts in the directory $(scriptdir)/ldscripts. - # We can't put the scripts in $(datadir) because the SEARCH_DIR - # directives need to be different for native and cross linkers. --scriptdir = $(tooldir)/lib -+scriptdir = $(libdir) - - EMUL = @EMUL@ - EMULATION_OFILES = @EMULATION_OFILES@ -diff -u binutils-2.17.50.0.17.oorig/ld/Makefile.in binutils-2.17.50.0.17/ld/Makefile.in ---- binutils-2.17.50.0.17.oorig/ld/Makefile.in 2007-06-18 19:29:29.000000000 +0200 -+++ binutils-2.17.50.0.17/ld/Makefile.in 2007-06-25 10:00:36.000000000 +0200 -@@ -287,7 +287,7 @@ - # We put the scripts in the directory $(scriptdir)/ldscripts. - # We can't put the scripts in $(datadir) because the SEARCH_DIR - # directives need to be different for native and cross linkers. --scriptdir = $(tooldir)/lib -+scriptdir = $(libdir) - BASEDIR = $(srcdir)/.. - BFDDIR = $(BASEDIR)/bfd - INCDIR = $(BASEDIR)/include diff --git a/packages/toolchain/devel/binutils/patches/02_fix-missing-makeinfo.diff b/packages/toolchain/devel/binutils/patches/02_fix-missing-makeinfo.diff deleted file mode 100644 index 8fa934b9be..0000000000 --- a/packages/toolchain/devel/binutils/patches/02_fix-missing-makeinfo.diff +++ /dev/null @@ -1,14 +0,0 @@ -This patch avoids the "missing" script to return an error when -makeinfo (from texinfo package) isn't available on host - ---- binutils-2.17.50.0.17.orig/missing 2007-10-17 02:04:41.000000000 +0200 -+++ binutils-2.17.50.0.17/missing 2007-10-17 02:05:24.000000000 +0200 -@@ -299,7 +299,7 @@ - fi - # If the file does not exist, the user really needs makeinfo; - # let's fail without touching anything. -- test -f $file || exit 1 -+ # test -f $file || exit 1 - touch $file - ;; - diff --git a/packages/toolchain/devel/binutils/patches/110-arm-eabi-conf.diff b/packages/toolchain/devel/binutils/patches/110-arm-eabi-conf.diff deleted file mode 100644 index af26329d90..0000000000 --- a/packages/toolchain/devel/binutils/patches/110-arm-eabi-conf.diff +++ /dev/null @@ -1,24 +0,0 @@ -diff -rdup binutils-2.18.50.0.3.orig/configure binutils-2.18.50.0.3/configure ---- binutils-2.18.50.0.3.orig/configure 2007-11-22 12:41:26.000000000 +0100 -+++ binutils-2.18.50.0.3/configure 2007-11-22 12:45:01.000000000 +0100 -@@ -2245,7 +2245,7 @@ case "${target}" in - noconfigdirs="$noconfigdirs target-libffi target-qthreads" - libgloss_dir=arm - ;; -- arm*-*-linux-gnueabi) -+ arm*-*-linux-*gnueabi) - noconfigdirs="$noconfigdirs target-qthreads" - noconfigdirs="$noconfigdirs target-libobjc" - case ${with_newlib} in -diff -rdup binutils-2.18.50.0.3.orig/configure.ac binutils-2.18.50.0.3/configure.ac ---- binutils-2.18.50.0.3.orig/configure.ac 2007-11-22 12:41:26.000000000 +0100 -+++ binutils-2.18.50.0.3/configure.ac 2007-11-22 12:44:54.000000000 +0100 -@@ -522,7 +522,7 @@ case "${target}" in - noconfigdirs="$noconfigdirs target-libffi target-qthreads" - libgloss_dir=arm - ;; -- arm*-*-linux-gnueabi) -+ arm*-*-linux-*gnueabi) - noconfigdirs="$noconfigdirs target-qthreads" - noconfigdirs="$noconfigdirs target-libobjc" - case ${with_newlib} in diff --git a/packages/toolchain/devel/binutils/patches/12_check_ldrunpath_length.diff b/packages/toolchain/devel/binutils/patches/12_check_ldrunpath_length.diff deleted file mode 100644 index c054f26005..0000000000 --- a/packages/toolchain/devel/binutils/patches/12_check_ldrunpath_length.diff +++ /dev/null @@ -1,23 +0,0 @@ -diff -Naur binutils-2.20.51.0.3.orig/ld/emultempl/elf32.em binutils-2.20.51.0.3/ld/emultempl/elf32.em ---- binutils-2.20.51.0.3.orig/ld/emultempl/elf32.em 2009-11-17 21:44:38.142032544 +0100 -+++ binutils-2.20.51.0.3/ld/emultempl/elf32.em 2009-11-17 21:46:37.073216252 +0100 -@@ -1250,7 +1250,9 @@ - && command_line.rpath == NULL) - { - lib_path = (const char *) getenv ("LD_RUN_PATH"); -- if (gld${EMULATION_NAME}_search_needed (lib_path, &n, -+ if ((lib_path) && (strlen (lib_path) == 0)) -+ lib_path = NULL; -+ if (gld${EMULATION_NAME}_search_needed (lib_path, &n, - force)) - break; - } -@@ -1476,6 +1478,8 @@ - rpath = command_line.rpath; - if (rpath == NULL) - rpath = (const char *) getenv ("LD_RUN_PATH"); -+ if ((rpath) && (strlen (rpath) == 0)) -+ rpath = NULL; - - for (abfd = link_info.input_bfds; abfd; abfd = abfd->link_next) - { diff --git a/packages/toolchain/devel/binutils/patches/binutils-2.20.51.0.9-multi_os_directory.diff b/packages/toolchain/devel/binutils/patches/binutils-2.20.51.0.9-multi_os_directory.diff new file mode 100644 index 0000000000..c9a428c9ab --- /dev/null +++ b/packages/toolchain/devel/binutils/patches/binutils-2.20.51.0.9-multi_os_directory.diff @@ -0,0 +1,96 @@ +diff -Naur binutils-2.20.51.0.9-old/bfd/configure binutils-2.20.51.0.9-new/bfd/configure +--- binutils-2.20.51.0.9-old/bfd/configure 2010-05-27 11:22:20.000000000 -0700 ++++ binutils-2.20.51.0.9-new/bfd/configure 2010-05-27 16:15:59.000000000 -0700 +@@ -10320,7 +10320,7 @@ + # Ok, now we have the path, separated by spaces, we can step through it + # and add multilib dir if necessary. + lt_tmp_lt_search_path_spec= +- lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` ++ lt_multi_os_dir='../lib' + for lt_sys_path in $lt_search_path_spec; do + if test -d "$lt_sys_path/$lt_multi_os_dir"; then + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" +diff -Naur binutils-2.20.51.0.9-old/binutils/configure binutils-2.20.51.0.9-new/binutils/configure +--- binutils-2.20.51.0.9-old/binutils/configure 2010-05-27 11:22:22.000000000 -0700 ++++ binutils-2.20.51.0.9-new/binutils/configure 2010-05-27 16:15:59.000000000 -0700 +@@ -10114,7 +10114,7 @@ + # Ok, now we have the path, separated by spaces, we can step through it + # and add multilib dir if necessary. + lt_tmp_lt_search_path_spec= +- lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` ++ lt_multi_os_dir='../lib' + for lt_sys_path in $lt_search_path_spec; do + if test -d "$lt_sys_path/$lt_multi_os_dir"; then + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" +diff -Naur binutils-2.20.51.0.9-old/gas/configure binutils-2.20.51.0.9-new/gas/configure +--- binutils-2.20.51.0.9-old/gas/configure 2010-04-13 06:26:42.000000000 -0700 ++++ binutils-2.20.51.0.9-new/gas/configure 2010-05-27 16:15:59.000000000 -0700 +@@ -10101,7 +10101,7 @@ + # Ok, now we have the path, separated by spaces, we can step through it + # and add multilib dir if necessary. + lt_tmp_lt_search_path_spec= +- lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` ++ lt_multi_os_dir='../lib' + for lt_sys_path in $lt_search_path_spec; do + if test -d "$lt_sys_path/$lt_multi_os_dir"; then + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" +diff -Naur binutils-2.20.51.0.9-old/gprof/configure binutils-2.20.51.0.9-new/gprof/configure +--- binutils-2.20.51.0.9-old/gprof/configure 2010-04-13 06:26:45.000000000 -0700 ++++ binutils-2.20.51.0.9-new/gprof/configure 2010-05-27 16:15:59.000000000 -0700 +@@ -10039,7 +10039,7 @@ + # Ok, now we have the path, separated by spaces, we can step through it + # and add multilib dir if necessary. + lt_tmp_lt_search_path_spec= +- lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` ++ lt_multi_os_dir='../lib' + for lt_sys_path in $lt_search_path_spec; do + if test -d "$lt_sys_path/$lt_multi_os_dir"; then + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" +diff -Naur binutils-2.20.51.0.9-old/ld/configure binutils-2.20.51.0.9-new/ld/configure +--- binutils-2.20.51.0.9-old/ld/configure 2010-05-27 11:22:31.000000000 -0700 ++++ binutils-2.20.51.0.9-new/ld/configure 2010-05-27 16:15:59.000000000 -0700 +@@ -10528,7 +10528,7 @@ + # Ok, now we have the path, separated by spaces, we can step through it + # and add multilib dir if necessary. + lt_tmp_lt_search_path_spec= +- lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` ++ lt_multi_os_dir='../lib' + for lt_sys_path in $lt_search_path_spec; do + if test -d "$lt_sys_path/$lt_multi_os_dir"; then + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" +diff -Naur binutils-2.20.51.0.9-old/libiberty/Makefile.in binutils-2.20.51.0.9-new/libiberty/Makefile.in +--- binutils-2.20.51.0.9-old/libiberty/Makefile.in 2010-05-27 11:22:33.000000000 -0700 ++++ binutils-2.20.51.0.9-new/libiberty/Makefile.in 2010-05-27 16:15:59.000000000 -0700 +@@ -327,7 +327,7 @@ + # multilib-specific flags, it's overridden by FLAGS_TO_PASS from the + # default multilib, so we have to take CFLAGS into account as well, + # since it will be passed the multilib flags. +-MULTIOSDIR = `$(CC) $(CFLAGS) -print-multi-os-directory` ++MULTIOSDIR = '../lib' + install_to_libdir: all + ${mkinstalldirs} $(DESTDIR)$(libdir)/$(MULTIOSDIR) + $(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)n +diff -Naur binutils-2.20.51.0.9-old/libtool.m4 binutils-2.20.51.0.9-new/libtool.m4 +--- binutils-2.20.51.0.9-old/libtool.m4 2010-01-15 09:05:56.000000000 -0800 ++++ binutils-2.20.51.0.9-new/libtool.m4 2010-05-27 16:15:59.000000000 -0700 +@@ -2043,7 +2043,7 @@ + # Ok, now we have the path, separated by spaces, we can step through it + # and add multilib dir if necessary. + lt_tmp_lt_search_path_spec= +- lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` ++ lt_multi_os_dir='../lib' + for lt_sys_path in $lt_search_path_spec; do + if test -d "$lt_sys_path/$lt_multi_os_dir"; then + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" +diff -Naur binutils-2.20.51.0.9-old/opcodes/configure binutils-2.20.51.0.9-new/opcodes/configure +--- binutils-2.20.51.0.9-old/opcodes/configure 2010-04-13 06:26:47.000000000 -0700 ++++ binutils-2.20.51.0.9-new/opcodes/configure 2010-05-27 16:15:59.000000000 -0700 +@@ -10050,7 +10050,7 @@ + # Ok, now we have the path, separated by spaces, we can step through it + # and add multilib dir if necessary. + lt_tmp_lt_search_path_spec= +- lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` ++ lt_multi_os_dir='../lib' + for lt_sys_path in $lt_search_path_spec; do + if test -d "$lt_sys_path/$lt_multi_os_dir"; then + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"