From 965018f4ff4e032f7ac8734b3a591ad3fafc4a07 Mon Sep 17 00:00:00 2001
From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Wed, 17 Aug 2011 16:35:21 +0200
Subject: [PATCH] binutils: update to 2.18.

---
 config/rootfiles/common/binutils            |  5 +++--
 lfs/binutils                                | 20 +++-----------------
 src/patches/binutils-2.18-configure-1.patch | 19 +++++++++++++++++++
 3 files changed, 25 insertions(+), 19 deletions(-)
 create mode 100644 src/patches/binutils-2.18-configure-1.patch

diff --git a/config/rootfiles/common/binutils b/config/rootfiles/common/binutils
index b4a1e499bf..0cd5af9150 100644
--- a/config/rootfiles/common/binutils
+++ b/config/rootfiles/common/binutils
@@ -44,12 +44,12 @@
 #usr/lib/ldscripts/i386linux.xn
 #usr/lib/ldscripts/i386linux.xr
 #usr/lib/ldscripts/i386linux.xu
-#usr/lib/libbfd-2.17.so
+#usr/lib/libbfd-2.18.so
 #usr/lib/libbfd.a
 #usr/lib/libbfd.la
 #usr/lib/libbfd.so
 #usr/lib/libiberty.a
-#usr/lib/libopcodes-2.17.so
+#usr/lib/libopcodes-2.18.so
 #usr/lib/libopcodes.a
 #usr/lib/libopcodes.la
 #usr/lib/libopcodes.so
@@ -71,4 +71,5 @@
 #usr/man/man1/size.1
 #usr/man/man1/strings.1
 #usr/man/man1/strip.1
+#usr/man/man1/windmc.1
 #usr/man/man1/windres.1
diff --git a/lfs/binutils b/lfs/binutils
index 464ac52fc3..ab28c79781 100644
--- a/lfs/binutils
+++ b/lfs/binutils
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.17
+VER        = 2.18
 
 THISAPP    = binutils-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -34,23 +34,10 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 # Normal build or /tools build.
 #
 ifeq "$(ROOT)" ""
-ifeq "$(LFS_PASS)" "install"
-  TARGET = $(DIR_INFO)/$(THISAPP)-install
-  EXTRA_CONFIG = --prefix=/opt/$(MACHINE)-uClibc \
-		--build=$(MACHINE)-pc-linux-gnu \
-		--host=$(MACHINE)-pc-linux-gnu \
-		--target=$(MACHINE)-linux-uclibc \
-		--disable-nls \
-		--enable-multilib \
-		--disable-werror
-  EXTRA_MAKE = all
-  EXTRA_INSTALL = 
-else
   TARGET = $(DIR_INFO)/$(THISAPP)
   EXTRA_CONFIG = --prefix=/usr --enable-shared --disable-nls
   EXTRA_MAKE = tooldir=/usr
   EXTRA_INSTALL = tooldir=/usr
-endif
 else
 ifeq "$(PASS)" "1"
   TARGET = $(DIR_INFO)/$(THISAPP)-tools1
@@ -73,7 +60,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = e26e2e06b6e4bf3acf1dc8688a94c0d1
+$(DL_FILE)_MD5 = 9d22ee4dafa3a194457caf4706f9cf01
 
 install : $(TARGET)
 
@@ -104,6 +91,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) $(DIR_SRC)/binutils-build && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
 	@mkdir $(DIR_SRC)/binutils-build
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-configure-1.patch
 	cd $(DIR_SRC)/binutils-build && $(DIR_APP)/configure $(EXTRA_CONFIG)
 ifeq "$(PASS)" "1"
 	cd $(DIR_SRC)/binutils-build && make configure-host
@@ -111,9 +99,7 @@ endif
 	cd $(DIR_SRC)/binutils-build && make $(EXTRA_MAKE) $(MAKETUNING)
 	cd $(DIR_SRC)/binutils-build && make $(EXTRA_INSTALL) install
 ifeq "$(ROOT)" ""
-ifneq "$(LFS_PASS)" "install"
 	cp -v $(DIR_APP)/include/libiberty.h /usr/include
-endif
 else
 ifeq "$(PASS)" "1"
 	cd $(DIR_SRC)/binutils-build && make -C ld clean
diff --git a/src/patches/binutils-2.18-configure-1.patch b/src/patches/binutils-2.18-configure-1.patch
new file mode 100644
index 0000000000..ae6aaa3d9e
--- /dev/null
+++ b/src/patches/binutils-2.18-configure-1.patch
@@ -0,0 +1,19 @@
+Submitted By: Matt Burgess (matthew at linuxfromscratch dot org)
+Date: 2007-11-19
+Initial Package Version: 2.18
+Origin: Upstream (http://sourceware.org/cgi-bin/cvsweb.cgi/src/configure.diff?r1=1.268&r2=1.268.2.1&cvsroot=src)
+Upstream Status: Applied
+Description: Fixes the configure script to correctly dictate Texinfo > 4.9.
+
+diff -Naur binutils-2.18.orig/configure binutils-2.18/configure
+--- binutils-2.18.orig/configure	2007-08-06 20:29:40.000000000 +0000
++++ binutils-2.18/configure	2007-11-18 22:37:58.000000000 +0000
+@@ -6128,7 +6128,7 @@
+     # For an installed makeinfo, we require it to be from texinfo 4.4 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\.([4-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then
+       :
+     else
+       MAKEINFO="$MISSING makeinfo"
-- 
2.39.2