X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fbinutils;h=791483f218a7a6c0881c88a4a4f8a3a157ba24f8;hp=2b92d78db33dda5dcf243e5725eff96ad86f8a0f;hb=8e6a8fd5d3b36919ff427abcdd0e7072fc7f85d9;hpb=e22c79733eaa73eb0a2817473f6ef261f789b508

diff --git a/lfs/binutils b/lfs/binutils
index 2b92d78db..791483f21 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-2011  IPFire Team  <info@ipfire.org>                     #
+#                                                                             #
+# 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.16.1
+VER        = 2.22
 
 THISAPP    = binutils-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -37,23 +35,47 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 #
 ifeq "$(ROOT)" ""
   TARGET = $(DIR_INFO)/$(THISAPP)
-  EXTRA_CONFIG = --prefix=/usr --enable-shared --disable-nls
+  EXTRA_CONFIG = \
+	--prefix=/usr \
+	--enable-shared \
+	--disable-nls
   EXTRA_MAKE = tooldir=/usr
   EXTRA_INSTALL = tooldir=/usr
 else
 ifeq "$(PASS)" "1"
+  CFLAGS := $(patsubst -march=%,,$(CFLAGS))
+  CFLAGS := $(patsubst -mfloat-abi=%,,$(CFLAGS))
   TARGET = $(DIR_INFO)/$(THISAPP)-tools1
-  EXTRA_CONFIG = --prefix=/tools --disable-nls
-  EXTRA_MAKE = LDFLAGS="-all-static"
+  EXTRA_CONFIG = \
+	--target=$(CROSSTARGET) \
+	--prefix=/tools \
+	--disable-nls \
+	--disable-werror
+  EXTRA_MAKE =
   EXTRA_INSTALL = 
 else
   TARGET = $(DIR_INFO)/$(THISAPP)-tools2
-  EXTRA_CONFIG = --prefix=/tools --with-lib-path=/tools/lib --disable-nls
+  EXTRA_ENV = \
+	CC="$(CROSSTARGET)-gcc -B/tools/lib/" \
+	AR="$(CROSSTARGET)-ar" \
+	RANLIB="$(CROSSTARGET)-ranlib"
+  EXTRA_CONFIG = \
+	--host=$(BUILDTARGET) \
+	--build=$(BUILDTARGET) \
+	--prefix=/tools \
+	--with-lib-path=/tools/lib \
+	--disable-nls
   EXTRA_MAKE = 
   EXTRA_INSTALL = 
 endif
 endif
 
+ifeq "$(MACHINE_TYPE)" "arm"
+	EXTRA_CONFIG += \
+		--with-abi=aapcs-linux \
+		--with-float=soft
+endif
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -62,7 +84,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 6a9d529efb285071dad10e1f3d2b2967
+$(DL_FILE)_MD5 = ee0f10756c84979622b992a4a61ea3f5
 
 install : $(TARGET)
 
@@ -93,24 +115,19 @@ $(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_SRC)/binutils-build && $(DIR_APP)/configure $(EXTRA_CONFIG)
-ifeq "$(PASS)" "1"
-	cd $(DIR_SRC)/binutils-build && make configure-host
-#	cd $(DIR_SRC)/binutils-build && make $(MAKETUNING)
-#	cd $(DIR_SRC)/binutils-build && make clean
-endif
-	cd $(DIR_SRC)/binutils-build && make $(EXTRA_MAKE) #$(MAKETUNING)
-	cd $(DIR_SRC)/binutils-build && make $(EXTRA_INSTALL) install
+
+	# Prevent installing libiberty to lib64.
+	cd $(DIR_APP) && sed -i 's%\(^MULTIOSDIR = \).*%\1 ../lib%' libiberty/Makefile.in
+
+	cd $(DIR_SRC)/binutils-build && $(EXTRA_ENV) MACHINE= $(DIR_APP)/configure $(EXTRA_CONFIG)
+	cd $(DIR_SRC)/binutils-build && make $(EXTRA_MAKE) $(MAKETUNING) MACHINE=
+	cd $(DIR_SRC)/binutils-build && make $(EXTRA_INSTALL) install MACHINE=
 ifeq "$(ROOT)" ""
-	cd $(DIR_APP)/binutils-build && cp -v ../$(THISAPP)/include/libiberty.h /usr/include
-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
+	cp -v $(DIR_APP)/include/libiberty.h /usr/include
 else
-	cd $(DIR_SRC)/binutils-build && make -C ld clean
-	cd $(DIR_SRC)/binutils-build && make -C ld LIB_PATH=/usr/lib:/lib
+ifeq "$(PASS)" "2"
+	cd $(DIR_SRC)/binutils-build && make -C ld clean MACHINE=
+	cd $(DIR_SRC)/binutils-build && make -C ld LIB_PATH=/usr/lib:/lib MACHINE=
 	cd $(DIR_SRC)/binutils-build && cp -v ld/ld-new /tools/bin
 endif
 endif