X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fbinutils;h=5afaeec2fbceae60413ee1a622599f52eeef6ce9;hb=24247159dd2d757690798f93e40499e217fee58a;hp=48aee5c3284f9b2f04e816332a2584fabbdc01f9;hpb=3e5f5165063b57f09aadc43e5e549cc9673e1fa3;p=ipfire-2.x.git

diff --git a/lfs/binutils b/lfs/binutils
index 48aee5c328..5afaeec2fb 100644
--- a/lfs/binutils
+++ b/lfs/binutils
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2011  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,7 +24,7 @@
 
 include Config
 
-VER        = 2.22
+VER        = 2.24
 
 THISAPP    = binutils-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -38,16 +38,21 @@ ifeq "$(ROOT)" ""
   EXTRA_CONFIG = \
 	--prefix=/usr \
 	--enable-shared \
-	--disable-nls
+	--disable-nls \
+	--disable-werror
   EXTRA_MAKE = tooldir=/usr
   EXTRA_INSTALL = tooldir=/usr
 else
 ifeq "$(PASS)" "1"
   CFLAGS := $(patsubst -march=%,,$(CFLAGS))
+  CFLAGS := $(patsubst -mfloat-abi=%,,$(CFLAGS))
+  CFLAGS := $(patsubst -fstack-protector-strong,-fstack-protector-all,$(CFLAGS))
   TARGET = $(DIR_INFO)/$(THISAPP)-tools1
   EXTRA_CONFIG = \
 	--target=$(CROSSTARGET) \
 	--prefix=/tools \
+	--with-sysroot=$(ROOT) \
+	--with-lib-path=/tools/lib \
 	--disable-nls \
 	--disable-werror
   EXTRA_MAKE =
@@ -63,7 +68,8 @@ else
 	--build=$(BUILDTARGET) \
 	--prefix=/tools \
 	--with-lib-path=/tools/lib \
-	--disable-nls
+	--disable-nls \
+	--disable-werror
   EXTRA_MAKE = 
   EXTRA_INSTALL = 
 endif
@@ -75,6 +81,9 @@ ifeq "$(MACHINE_TYPE)" "arm"
 		--with-float=soft
 endif
 
+EXTRA_CONFIG += \
+	--enable-64-bit-bfd
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -83,7 +92,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = ee0f10756c84979622b992a4a61ea3f5
+$(DL_FILE)_MD5 = e0f71a7b2ddab0f8612336ac81d9636b
 
 install : $(TARGET)
 
@@ -113,14 +122,16 @@ $(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.24-pt-pax-flags-20131231.patch
+
 	@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 && make $(EXTRA_MAKE) $(MAKETUNING) MACHINE= 
+	cd $(DIR_SRC)/binutils-build && make $(EXTRA_INSTALL) install MACHINE= 
 ifeq "$(ROOT)" ""
 	cp -v $(DIR_APP)/include/libiberty.h /usr/include
 else