###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2011 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2013 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 #
include Config
-VER = 2.18
+VER = 2.22
THISAPP = binutils-$(VER)
DL_FILE = $(THISAPP).tar.bz2
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
-# XXX maybe we can remove that ugly MACHINE= by this
-#unexport MACHINE
-
# Normal build or /tools build.
#
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 --disable-werror --disable-gprof
- #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
-EXTRA_CONFIG += --build=$(BUILDTARGET)
-
ifeq "$(MACHINE_TYPE)" "arm"
EXTRA_CONFIG += \
--with-abi=aapcs-linux \
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 9d22ee4dafa3a194457caf4706f9cf01
+$(DL_FILE)_MD5 = ee0f10756c84979622b992a4a61ea3f5
install : $(TARGET)
$(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
+
@mkdir $(DIR_SRC)/binutils-build
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-configure-1.patch
- cd $(DIR_SRC)/binutils-build && MACHINE= $(DIR_APP)/configure $(EXTRA_CONFIG)
-ifeq "$(PASS)" "1"
- cd $(DIR_SRC)/binutils-build && make configure-host MAKEINFO=makeinfo MACHINE=
-endif
- cd $(DIR_SRC)/binutils-build && make $(EXTRA_MAKE) $(MAKETUNING) MAKEINFO=makeinfo MACHINE=
- cd $(DIR_SRC)/binutils-build && make $(EXTRA_INSTALL) install MAKEINFO=makeinfo MACHINE=
+
+ # 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)" ""
cp -v $(DIR_APP)/include/libiberty.h /usr/include
else
-ifeq "$(PASS)" "1"
- cd $(DIR_SRC)/binutils-build && make -C ld clean MACHINE=
- cd $(DIR_SRC)/binutils-build && make -C ld LIB_PATH=/tools/lib MACHINE=
- cd $(DIR_SRC)/binutils-build && cp -v ld/ld-new /tools/bin
-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