From b5548cbb5ccb07c77fd8336f822b830aaf7278e5 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sun, 1 May 2016 14:20:34 +0200 Subject: [PATCH] toolchain: enable build on aarch64 multilib hosts Signed-off-by: Arne Fitzenreiter --- lfs/diffutils | 4 ++-- lfs/expect | 4 ++-- lfs/findutils | 4 ++-- lfs/gawk | 4 ++-- lfs/gettext | 4 ++-- lfs/ncurses | 3 ++- make.sh | 2 +- 7 files changed, 13 insertions(+), 12 deletions(-) diff --git a/lfs/diffutils b/lfs/diffutils index abfda309da..3e96c67655 100644 --- a/lfs/diffutils +++ b/lfs/diffutils @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2016 IPFire Team # # # # 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 # @@ -40,7 +40,7 @@ ifeq "$(ROOT)" "" EXTRA_INSTALL = else TARGET = $(DIR_INFO)/$(THISAPP)-tools - EXTRA_CONFIG = --prefix=/tools --disable-nls + EXTRA_CONFIG = --prefix=/tools --disable-nls --build=$(BUILDTARGET) EXTRA_MAKE = EXTRA_INSTALL = endif diff --git a/lfs/expect b/lfs/expect index 307f698613..d885f2f7f9 100644 --- a/lfs/expect +++ b/lfs/expect @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2016 IPFire Team # # # # 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 # @@ -71,7 +71,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) $(DIR_SRC)/tcl* && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-spawn-1.patch - cd $(DIR_APP) && ./configure --prefix=/tools --with-tcl=/tools/lib --with-tclinclude=/tools/include --with-x=no --disable-nls + cd $(DIR_APP) && ./configure --prefix=/tools --host=$(BUILDTARGET) --with-tcl=/tools/lib --with-tclinclude=/tools/include --with-x=no --disable-nls cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make SCRIPTS="" install @rm -rf $(DIR_APP) $(DIR_SRC)/tcl* diff --git a/lfs/findutils b/lfs/findutils index e2dd04a022..ac1ffdb926 100644 --- a/lfs/findutils +++ b/lfs/findutils @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2010 IPFire Team # +# Copyright (C) 2007-2016 IPFire Team # # # # 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 # @@ -41,7 +41,7 @@ ifeq "$(ROOT)" "" EXTRA_INSTALL = else TARGET = $(DIR_INFO)/$(THISAPP)-tools - EXTRA_CONFIG = --prefix=/tools --disable-nls + EXTRA_CONFIG = --prefix=/tools --disable-nls --build=$(BUILDTARGET) EXTRA_MAKE = EXTRA_INSTALL = endif diff --git a/lfs/gawk b/lfs/gawk index 66bbfac23e..c8cb89231f 100644 --- a/lfs/gawk +++ b/lfs/gawk @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2016 IPFire Team # # # # 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 # @@ -40,7 +40,7 @@ ifeq "$(ROOT)" "" EXTRA_INSTALL = else TARGET = $(DIR_INFO)/$(THISAPP)-tools - EXTRA_CONFIG = --prefix=/tools --disable-nls + EXTRA_CONFIG = --prefix=/tools --disable-nls --build=$(BUILDTARGET) EXTRA_MAKE = EXTRA_INSTALL = endif diff --git a/lfs/gettext b/lfs/gettext index b1ccbbebde..892bad9054 100644 --- a/lfs/gettext +++ b/lfs/gettext @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2016 IPFire Team # # # # 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 # @@ -40,7 +40,7 @@ ifeq "$(ROOT)" "" EXTRA_INSTALL = else TARGET = $(DIR_INFO)/$(THISAPP)-tools - EXTRA_CONFIG = --prefix=/tools --disable-shared --disable-nls + EXTRA_CONFIG = --prefix=/tools --disable-shared --disable-nls --build=$(BUILDTARGET) EXTRA_MAKE = EXTRA_INSTALL = endif diff --git a/lfs/ncurses b/lfs/ncurses index 1c0fb04271..552a6fc34e 100644 --- a/lfs/ncurses +++ b/lfs/ncurses @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2016 IPFire Team # # # # 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 # @@ -39,6 +39,7 @@ ifeq "$(ROOT)" "" else TARGET = $(DIR_INFO)/$(THISAPP)-tools PREFIX = /tools + EXTRA_CONFIG = --build=$(BUILDTARGET) endif EXTRA_CONFIG += \ diff --git a/make.sh b/make.sh index 69f62bc58a..8bff8646c2 100755 --- a/make.sh +++ b/make.sh @@ -260,7 +260,7 @@ buildtoolchain() { ;; # ARM - armv5tel:armv5tel|armv5tel:armv5tejl|armv5tel:armv6l|armv5tel:armv7l) + armv5tel:armv5tel|armv5tel:armv5tejl|armv5tel:armv6l|armv5tel:armv7l|armv5tel:aarch64) # These are working. ;; armv5tel:*) -- 2.39.2