From 4ae414a3ea3346bac6dc4b767f820010a4505330 Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Wed, 29 May 2019 14:28:51 +0200 Subject: [PATCH] fix ct build with bash 5 Signed-off-by: Jacek Jendrzej --- archive-patches/crosstool-ng_bash_version.diff | 13 +++++++++++++ make/crosstool.mk | 4 ++++ 2 files changed, 17 insertions(+) create mode 100644 archive-patches/crosstool-ng_bash_version.diff diff --git a/archive-patches/crosstool-ng_bash_version.diff b/archive-patches/crosstool-ng_bash_version.diff new file mode 100644 index 0000000..381f75a --- /dev/null +++ b/archive-patches/crosstool-ng_bash_version.diff @@ -0,0 +1,13 @@ +diff --git a/configure.ac b/configure.ac +index 869226c1..9fb78d2b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -273,7 +273,7 @@ ACX_PROG_VERSION_REQ_STRICT([BASH_SHELL], + [GNU bash >= 3.1], + [bash], + [bash], +- ['^GNU bash, version (3\.[1-9]|4)']) ++ ['^GNU bash, version (3\.[1-9]|4|5)']) + + # We need a awk that *is* GNU awk + ACX_PROG_VERSION_REQ_STRICT([AWK], diff --git a/make/crosstool.mk b/make/crosstool.mk index c5095f2..e14e1e9 100644 --- a/make/crosstool.mk +++ b/make/crosstool.mk @@ -40,6 +40,7 @@ crosstools-renew: make clean # ----------------------------------------------------------------------------- +CROSS_PATCH = crosstool-ng_bash_version.diff crosstool-arm-hd1: CROSS_DIR-check $(SOURCE_DIR)/$(NI_LINUX-KERNEL) make $(BUILD_TMP) @@ -49,6 +50,7 @@ crosstool-arm-hd1: CROSS_DIR-check $(SOURCE_DIR)/$(NI_LINUX-KERNEL) $(CHDIR)/crosstool-ng.git; \ git checkout 1dbb06f2 && \ unset CONFIG_SITE LIBRARY_PATH CPATH C_INCLUDE_PATH PKG_CONFIG_PATH CPLUS_INCLUDE_PATH INCLUDE && \ + $(call apply_patches, $(CROSS_PATCH)); \ $(MKDIR)/crosstool-ng/targets/src/ && \ pushd $(SOURCE_DIR)/$(NI_LINUX-KERNEL) && \ git checkout $(KERNEL_BRANCH) && \ @@ -81,6 +83,7 @@ crosstool-arm-hd2: CROSS_DIR-check $(ARCHIVE)/gcc-linaro-$(GCC_VER).tar.xz $(SOU git checkout 1dbb06f2 && \ cp -a $(PATCHES)/crosstool-ng/gcc/* $(BUILD_TMP)/crosstool-ng/patches/gcc/linaro-6.3-2017.02 && \ unset CONFIG_SITE LIBRARY_PATH CPATH C_INCLUDE_PATH PKG_CONFIG_PATH CPLUS_INCLUDE_PATH INCLUDE && \ + $(call apply_patches, $(CROSS_PATCH)); \ $(MKDIR)/crosstool-ng/targets/src/ && \ pushd $(SOURCE_DIR)/$(NI_LINUX-KERNEL) && \ git checkout $(KERNEL_BRANCH) && \ @@ -113,6 +116,7 @@ crosstool-arm-hd51: CROSS_DIR-check $(SOURCE_DIR)/$(NI_LINUX-KERNEL) git checkout 1dbb06f2 && \ cp -a $(PATCHES)/crosstool-ng/gcc/* $(BUILD_TMP)/crosstool-ng/patches/gcc/linaro-6.3-2017.02 && \ unset CONFIG_SITE LIBRARY_PATH CPATH C_INCLUDE_PATH PKG_CONFIG_PATH CPLUS_INCLUDE_PATH INCLUDE && \ + $(call apply_patches, $(CROSS_PATCH)); \ $(MKDIR)/crosstool-ng/targets/src/ && \ pushd $(SOURCE_DIR)/$(NI_LINUX-KERNEL) && \ git checkout $(KERNEL_BRANCH) && \ -- 2.21.0