X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fbinutils;h=8bf6decd94ffff73f4865af6619905757a65fefe;hb=01d7a56295519ea29fd42c5773851744d0ee31ff;hp=27c83fb45be12662151d36a22b6765eb905c39ec;hpb=364452506fcc7170c000d2ac7fe7ae67351a6241;p=ipfire-2.x.git

diff --git a/lfs/binutils b/lfs/binutils
index 27c83fb45b..8bf6decd94 100644
--- a/lfs/binutils
+++ b/lfs/binutils
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2015  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2016  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        #
@@ -24,10 +24,10 @@
 
 include Config
 
-VER        = 2.22
+VER        = 2.28
 
 THISAPP    = binutils-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
+DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
@@ -38,45 +38,49 @@ ifeq "$(ROOT)" ""
   EXTRA_CONFIG = \
 	--prefix=/usr \
 	--enable-shared \
-	--disable-nls
+	--with-system-zlib \
+	--enable-plugins \
+	--enable-ld=default \
+	--disable-gold
   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 = \
 	--target=$(CROSSTARGET) \
 	--prefix=/tools \
-	--disable-nls \
-	--disable-werror
+	--with-sysroot=$(ROOT) \
+	--with-lib-path=/tools/lib
   EXTRA_MAKE =
   EXTRA_INSTALL = 
 else
   TARGET = $(DIR_INFO)/$(THISAPP)-tools2
   EXTRA_ENV = \
-	CC="$(CROSSTARGET)-gcc -B/tools/lib/" \
+	CC="$(CROSSTARGET)-gcc" \
 	AR="$(CROSSTARGET)-ar" \
 	RANLIB="$(CROSSTARGET)-ranlib"
   EXTRA_CONFIG = \
 	--host=$(BUILDTARGET) \
 	--build=$(BUILDTARGET) \
 	--prefix=/tools \
-	--with-lib-path=/tools/lib \
-	--disable-nls
+	--with-lib-path=/tools/lib
   EXTRA_MAKE = 
   EXTRA_INSTALL = 
 endif
 endif
 
-ifeq "$(MACHINE_TYPE)" "arm"
+ifeq "$(BUILD_ARCH)" "armv5tel"
 	EXTRA_CONFIG += \
 		--with-abi=aapcs-linux \
 		--with-float=soft
 endif
 
 EXTRA_CONFIG += \
+	--disable-werror \
 	--enable-64-bit-bfd
 
 ###############################################################################
@@ -87,7 +91,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = ee0f10756c84979622b992a4a61ea3f5
+$(DL_FILE)_MD5 = d5d270fd0b698ed59ca5ade8e1b5059c
 
 install : $(TARGET)
 
@@ -116,29 +120,26 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) $(DIR_SRC)/binutils-build && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/binutils-2.22-pt-pax-flags-20111121.patch
-
-	# texinfo 5 syntax-fix.
-	cd $(DIR_APP) && sed -i -e "s/@colophon/@@colophon/" \
-				-e "s/doc@cygnus/doc@@cygnus/" bfd/doc/bfd.texinfo
-
+	@rm -rf $(DIR_APP) $(DIR_SRC)/binutils-build && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
 	@mkdir $(DIR_SRC)/binutils-build
 
 	# 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= 
+	cd $(DIR_SRC)/binutils-build && $(EXTRA_ENV) $(DIR_APP)/configure $(EXTRA_CONFIG)
+	cd $(DIR_SRC)/binutils-build && make $(EXTRA_MAKE) $(MAKETUNING)
+	cd $(DIR_SRC)/binutils-build && make $(EXTRA_INSTALL) install
 ifeq "$(ROOT)" ""
 	cp -v $(DIR_APP)/include/libiberty.h /usr/include
-else
-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
+
+ifeq "$(TOOLCHAIN)" "1"
+ ifeq "$(PASS)" "2"
+	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)