X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fbinutils;h=25145cceed7741b252d0768ef8d1606e01e504b6;hb=e2b8b617a724a1ca0d032e4ffff01ed67002e0ba;hp=4cdc94b631ceb8d06b148de3a98a2dd6fa9943cb;hpb=1751628e3cdc68df2429f5668c5e360e1b3ea73b;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/binutils b/lfs/binutils
index 4cdc94b631..25145cceed 100644
--- a/lfs/binutils
+++ b/lfs/binutils
@@ -1,22 +1,20 @@
 ###############################################################################
-# This file is part of the IPCop Firewall.                                    #
 #                                                                             #
-# IPCop is free software; you can redistribute it and/or modify               #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation; either version 2 of the License, or           #
+# the Free Software Foundation, either version 3 of the License, or           #
 # (at your option) any later version.                                         #
 #                                                                             #
-# IPCop is distributed in the hope that it will be useful,                    #
+# This program is distributed in the hope that it will be useful,             #
 # but WITHOUT ANY WARRANTY; without even the implied warranty of              #
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
 # GNU General Public License for more details.                                #
 #                                                                             #
 # You should have received a copy of the GNU General Public License           #
-# along with IPCop; if not, write to the Free Software                        #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA    #
-#                                                                             #
-# Makefiles are based on LFSMake, which is                                    #
-# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
 
@@ -26,7 +24,7 @@
 
 include Config
 
-VER        = 2.15.90.0.3
+VER        = 2.17
 
 THISAPP    = binutils-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -36,19 +34,32 @@ 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 =
-  EXTRA_INSTALL =
+  EXTRA_MAKE = tooldir=/usr
+  EXTRA_INSTALL = tooldir=/usr
+endif
 else
-ifeq "$(LFS_PASS)" "1"
+ifeq "$(PASS)" "1"
   TARGET = $(DIR_INFO)/$(THISAPP)-tools1
-  EXTRA_CONFIG = --prefix=/tools --disable-nls
+  EXTRA_CONFIG = --prefix=/tools --disable-nls --disable-werror
   EXTRA_MAKE = LDFLAGS="-all-static"
   EXTRA_INSTALL = 
 else
   TARGET = $(DIR_INFO)/$(THISAPP)-tools2
-  EXTRA_CONFIG = --prefix=/tools --enable-shared --with-lib-path=/tools/lib --disable-nls
+  EXTRA_CONFIG = --prefix=/tools --with-lib-path=/tools/lib --disable-nls
   EXTRA_MAKE = 
   EXTRA_INSTALL = 
 endif
@@ -62,7 +73,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 1c1af0064ebd3d7bd99905874656a21e
+$(DL_FILE)_MD5 = e26e2e06b6e4bf3acf1dc8688a94c0d1
 
 install : $(TARGET)
 
@@ -94,15 +105,25 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@rm -rf $(DIR_APP) $(DIR_SRC)/binutils-build && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
 	@mkdir $(DIR_SRC)/binutils-build
 	cd $(DIR_SRC)/binutils-build && $(DIR_APP)/configure $(EXTRA_CONFIG)
-ifeq "$(ROOT)" ""
-	cd $(DIR_SRC)/binutils-build && make -j 3 $(EXTRA_MAKE)
-	cd $(DIR_SRC)/binutils-build && make $(EXTRA_INSTALL) install
-else
-ifeq "$(LFS_PASS)" "1"
+ifeq "$(PASS)" "1"
 	cd $(DIR_SRC)/binutils-build && make configure-host
 endif
-	cd $(DIR_SRC)/binutils-build && make -j 3 $(EXTRA_MAKE)
+	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
+	cd $(DIR_SRC)/binutils-build && make -C ld LIB_PATH=/tools/lib
+	cd $(DIR_SRC)/binutils-build && cp -v ld/ld-new /tools/bin
+else
+	cd $(DIR_SRC)/binutils-build && make -C ld clean
+	cd $(DIR_SRC)/binutils-build && make -C ld LIB_PATH=/usr/lib:/lib
+	cd $(DIR_SRC)/binutils-build && cp -v ld/ld-new /tools/bin
+endif
 endif
 	@rm -rf $(DIR_APP) $(DIR_SRC)/binutils-build
 	@$(POSTBUILD)