Commit 4c730a2c authored by Gustavo Zacarias's avatar Gustavo Zacarias Committed by Peter Korsgaard
Browse files

binutils: remove deprecated versions 



Remove already deprecated binutils version 2.18, 2.19 and 2.19.1.
Keep 2.18-avr32.

Signed-off-by: default avatarGustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 72958d1e

package/binutils/Config.in.host

+0 −18
Original line number Diff line number Diff line
@@ -8,25 +8,10 @@ choice 
	help

	  Select the version of binutils you wish to use.



	config BR2_BINUTILS_VERSION_2_18

		depends on !BR2_avr32

		depends on BR2_DEPRECATED

		bool "binutils 2.18"



	config BR2_BINUTILS_VERSION_2_18_AVR32_1_0_1

	       depends on BR2_avr32

	       bool "binutils 2.18-avr32-1.0.1"



	config BR2_BINUTILS_VERSION_2_19

		depends on !BR2_avr32

		depends on BR2_DEPRECATED

		bool "binutils 2.19"



	config BR2_BINUTILS_VERSION_2_19_1

		depends on !BR2_avr32

		depends on BR2_DEPRECATED

		bool "binutils 2.19.1"



	config BR2_BINUTILS_VERSION_2_20

		depends on !BR2_avr32

		bool "binutils 2.20"
@@ -47,10 +32,7 @@ endchoice 


config BR2_BINUTILS_VERSION

	string

	default "2.18"		if BR2_BINUTILS_VERSION_2_18

	default "2.18-avr32-1.0.1" if BR2_BINUTILS_VERSION_2_18_AVR32_1_0_1

	default "2.19"		if BR2_BINUTILS_VERSION_2_19

	default "2.19.1"	if BR2_BINUTILS_VERSION_2_19_1

	default "2.20"		if BR2_BINUTILS_VERSION_2_20

	default "2.20.1"	if BR2_BINUTILS_VERSION_2_20_1

	default "2.21"		if BR2_BINUTILS_VERSION_2_21

package/binutils/binutils-2.18/100-makeinfo-version.patch

deleted100644 → 0
+0 −32
Original line number Diff line number Diff line 
diff -u binutils-2.18-orig/configure binutils-2.18/configure

--- binutils-2.18-orig/configure	2007-08-06 16:29:40.000000000 -0400

+++ binutils-2.18/configure	2007-09-27 22:41:51.000000000 -0400

@@ -6125,10 +6125,10 @@

   *" texinfo "*) MAKEINFO='$$r/$(BUILD_SUBDIR)/texinfo/makeinfo/makeinfo' ;;

   *)

 

-    # For an installed makeinfo, we require it to be from texinfo 4.4 or

+    # For an installed makeinfo, we require it to be from texinfo 4.6 or

     # higher, else we use the "missing" dummy.

     if ${MAKEINFO} --version \

-       | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[4-9]|[5-9])' >/dev/null 2>&1; then

+       | egrep 'texinfo[^0-9]*(4\.([6-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then

       :

     else

       MAKEINFO="$MISSING makeinfo"

diff -u binutils-2.18-orig/configure.ac binutils-2.18/configure.ac

--- binutils-2.18-orig/configure.ac	2007-08-28 16:24:26.000000000 -0400

+++ binutils-2.18/configure.ac	2007-09-27 22:41:00.000000000 -0400

@@ -2400,10 +2400,10 @@

   *" texinfo "*) MAKEINFO='$$r/$(BUILD_SUBDIR)/texinfo/makeinfo/makeinfo' ;;

   *)

 changequote(,)

-    # For an installed makeinfo, we require it to be from texinfo 4.4 or

+    # For an installed makeinfo, we require it to be from texinfo 4.6 or

     # higher, else we use the "missing" dummy.

     if ${MAKEINFO} --version \

-       | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[4-9]|[5-9])' >/dev/null 2>&1; then

+       | egrep 'texinfo[^0-9]*(4\.([6-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then

       :

     else

       MAKEINFO="$MISSING makeinfo"

package/binutils/binutils-2.18/110-arm-eabi-conf.patch

deleted100644 → 0
+0 −24
Original line number Diff line number Diff line 
diff -u binutils-2.17.50.0.17.oorig/configure binutils-2.17.50.0.17/configure

--- binutils-2.17.50.0.17.oorig/configure	2007-06-18 19:29:28.000000000 +0200

+++ binutils-2.17.50.0.17/configure	2007-06-25 09:58:36.000000000 +0200

@@ -2224,7 +2224,7 @@

   arm-*-elf* | strongarm-*-elf* | xscale-*-elf* | arm*-*-eabi* )

     noconfigdirs="$noconfigdirs target-libffi target-qthreads"

     ;;

-  arm*-*-linux-gnueabi)

+  arm*-*-linux-gnueabi | arm*-*-linux-uclibcgnueabi)

     noconfigdirs="$noconfigdirs target-libffi target-qthreads"

     noconfigdirs="$noconfigdirs target-libjava target-libobjc"

     ;;

diff -u binutils-2.17.50.0.17.oorig/configure.ac binutils-2.17.50.0.17/configure.ac

--- binutils-2.17.50.0.17.oorig/configure.ac	2007-06-18 19:29:28.000000000 +0200

+++ binutils-2.17.50.0.17/configure.ac	2007-06-25 09:58:36.000000000 +0200

@@ -513,7 +513,7 @@

   arm-*-elf* | strongarm-*-elf* | xscale-*-elf* | arm*-*-eabi* )

     noconfigdirs="$noconfigdirs target-libffi target-qthreads"

     ;;

-  arm*-*-linux-gnueabi)

+  arm*-*-linux-gnueabi | arm*-*-linux-uclibcgnueabi)

     noconfigdirs="$noconfigdirs target-libffi target-qthreads"

     noconfigdirs="$noconfigdirs target-libjava target-libobjc"

     ;;

package/binutils/binutils-2.18/300-001_ld_makefile_patch.patch

deleted100644 → 0
+0 −24
Original line number Diff line number Diff line 
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

package/binutils/binutils-2.18/300-012_check_ldrunpath_length.patch

deleted100644 → 0
+0 −21
Original line number Diff line number Diff line 
diff -u binutils-2.17.50.0.17.oorig/ld/emultempl/elf32.em binutils-2.17.50.0.17/ld/emultempl/elf32.em

--- binutils-2.17.50.0.17.oorig/ld/emultempl/elf32.em	2007-06-18 19:31:40.000000000 +0200

+++ binutils-2.17.50.0.17/ld/emultempl/elf32.em	2007-06-25 10:01:25.000000000 +0200

@@ -1007,6 +1007,8 @@

 	      && command_line.rpath == NULL)

 	    {

 	      lib_path = (const char *) getenv ("LD_RUN_PATH");

+	      if ((lib_path) && (strlen (lib_path) == 0))

+		  lib_path = NULL;

 	      if (gld${EMULATION_NAME}_search_needed (lib_path, &n,

 						      force))

 		break;

@@ -1191,6 +1193,8 @@

   rpath = command_line.rpath;

   if (rpath == NULL)

     rpath = (const char *) getenv ("LD_RUN_PATH");

+  if ((rpath) && (strlen (rpath) == 0))

+      rpath = NULL;

   if (! (bfd_elf_size_dynamic_sections

 	 (output_bfd, command_line.soname, rpath,

 	  command_line.filter_shlib,