###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2016 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2021 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.28
+VER = 2.37
THISAPP = binutils-$(VER)
-DL_FILE = $(THISAPP).tar.gz
+DL_FILE = $(THISAPP).tar.xz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
-# Normal build or /tools build.
+# Normal build or $(TOOLS_DIR) build.
#
ifeq "$(ROOT)" ""
TARGET = $(DIR_INFO)/$(THISAPP)
EXTRA_INSTALL = tooldir=/usr
else
ifeq "$(PASS)" "1"
+ CFLAGS := $(patsubst -march=%,,$(CFLAGS))
+ CFLAGS := $(patsubst -mfpu=%,,$(CFLAGS))
+ CFLAGS := $(patsubst -mfloat-abi=%,,$(CFLAGS))
+ CFLAGS := $(patsubst -mindirect-branch=%,,$(CFLAGS))
+ CFLAGS := $(patsubst -mfunction-return=%,,$(CFLAGS))
+ CFLAGS := $(patsubst -fstack-clash-protection,,$(CFLAGS))
+ CFLAGS := $(patsubst -fcf-protection,,$(CFLAGS))
+
TARGET = $(DIR_INFO)/$(THISAPP)-tools1
EXTRA_CONFIG = \
--target=$(CROSSTARGET) \
- --prefix=/tools \
+ --prefix=$(TOOLS_DIR) \
--with-sysroot=$(ROOT) \
- --with-lib-path=/tools/lib
+ --with-lib-path=$(TOOLS_DIR)/lib \
+ --disable-nls
EXTRA_MAKE =
- EXTRA_INSTALL =
+ EXTRA_INSTALL =
else
TARGET = $(DIR_INFO)/$(THISAPP)-tools2
EXTRA_ENV = \
AR="$(CROSSTARGET)-ar" \
RANLIB="$(CROSSTARGET)-ranlib"
EXTRA_CONFIG = \
- --host=$(BUILDTARGET) \
--build=$(BUILDTARGET) \
- --prefix=/tools \
- --with-lib-path=/tools/lib
- EXTRA_MAKE =
- EXTRA_INSTALL =
+ --host=$(BUILDTARGET) \
+ --prefix=$(TOOLS_DIR) \
+ --with-lib-path=$(TOOLS_DIR)/lib \
+ --with-sysroot \
+ --disable-nls
+ EXTRA_MAKE =
+ EXTRA_INSTALL =
endif
endif
-ifeq "$(BUILD_ARCH)" "armv5tel"
+ifeq "$(BUILD_ARCH)" "armv6l"
EXTRA_CONFIG += \
--with-abi=aapcs-linux \
- --with-float=soft
+ --with-float=softfp
endif
EXTRA_CONFIG += \
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = d5d270fd0b698ed59ca5ade8e1b5059c
+$(DL_FILE)_MD5 = e78d9ff2976b745a348f4c1f27c77cb1
install : $(TARGET)
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
+ cd $(DIR_SRC)/binutils-build && cp -v ld/ld-new $(TOOLS_DIR)/bin
endif
endif