From 147317630cb71d41776c3cba0f49e4f0e429c9b0 Mon Sep 17 00:00:00 2001
From: Markham <markham001@gmx.de>
Date: Tue, 11 Jun 2019 21:56:56 +0200
Subject: [PATCH] crosstool-arm.mk: build gcc-8.3.0

---
 make/applications.mk  |  8 ++++----
 make/crosstool-arm.mk | 21 ++++++++++-----------
 make/versions.mk      |  3 ++-
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/make/applications.mk b/make/applications.mk
index d1c9701..07b4ca3 100755
--- a/make/applications.mk
+++ b/make/applications.mk
@@ -134,10 +134,10 @@ $(D)/e2fsprogs: $(ARCHIVE)/e2fsprogs-$(E2FSPROGS_VER).tar.gz | $(TARGETPREFIX)
 			--enable-symlink-build \
 			--with-gnu-ld \
 			$(OPT_RESIZE2FS); \
-		$(MAKE); \
-		$(MAKE) install DESTDIR=$(TARGETPREFIX); \
-		$(MAKE) -C lib/uuid  install DESTDIR=$(TARGETPREFIX); \
-		$(MAKE) -C lib/blkid install DESTDIR=$(TARGETPREFIX); \
+		make; \
+		make install DESTDIR=$(TARGETPREFIX); \
+		make -C lib/uuid  install DESTDIR=$(TARGETPREFIX); \
+		make -C lib/blkid install DESTDIR=$(TARGETPREFIX); \
 		:
 	-rm $(addprefix $(TARGETPREFIX)/bin/, chattr lsattr uuidgen)
 	-rm $(addprefix $(TARGETPREFIX)/sbin/, dumpe2fs e2freefrag e2undo filefrag logsave)
diff --git a/make/crosstool-arm.mk b/make/crosstool-arm.mk
index ce8e42a..586ecfd 100644
--- a/make/crosstool-arm.mk
+++ b/make/crosstool-arm.mk
@@ -8,10 +8,6 @@ CROSSTOOL_NG_SOURCE = crosstool-ng-git-$(CROSSTOOL_NG_VER).tar.gz
 
 CUSTOM_KERNEL = $(ARCHIVE)/$(KERNEL_SRC)
 
-ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd51 bre2ze4k))
-CUSTOM_KERNEL_VER = $(KERNEL_VER)-arm
-endif
-
 ifeq ($(wildcard $(CROSS_BASE)/build.log.bz2),)
 CROSSTOOL = crosstool
 crosstool:
@@ -24,20 +20,20 @@ crosstool-ng: $(ARCHIVE)/$(KERNEL_SRC) $(ARCHIVE)/$(CROSSTOOL_NG_SOURCE)
 	fi;
 	$(REMOVE)/crosstool-ng-$(CROSSTOOL_NG_VER)
 	$(UNTAR)/$(CROSSTOOL_NG_SOURCE)
+	cp -a $(CUSTOM_KERNEL) $(BUILD_TMP)/linux-$(KERNEL_VER).tar.gz
 	unset CONFIG_SITE LIBRARY_PATH CPATH C_INCLUDE_PATH PKG_CONFIG_PATH CPLUS_INCLUDE_PATH INCLUDE; \
 	set -e; cd $(BUILD_TMP)/crosstool-ng-git-$(CROSSTOOL_NG_VER); \
-		cp -a $(PATCHES)/ct-ng/ct-ng-git-$(CROSSTOOL_NG_VER)-arm-$(BOXSERIES).config .config; \
+		cp -a $(PATCHES)/ct-ng/ct-ng-git-$(CROSSTOOL_NG_VER)-$(GCC_VER_ARM)-arm-$(BOXSERIES).config .config; \
 		NUM_CPUS=$$(expr `getconf _NPROCESSORS_ONLN` \* 2); \
 		MEM_512M=$$(awk '/MemTotal/ {M=int($$2/1024/512); print M==0?1:M}' /proc/meminfo); \
 		test $$NUM_CPUS -gt $$MEM_512M && NUM_CPUS=$$MEM_512M; \
 		test $$NUM_CPUS = 0 && NUM_CPUS=1; \
 		sed -i "s@^CT_PARALLEL_JOBS=.*@CT_PARALLEL_JOBS=$$NUM_CPUS@" .config; \
 		\
-		export CT_NG_ARCHIVE=$(ARCHIVE); \
-		export CT_NG_BASE_DIR=$(CROSS_BASE); \
-		export CT_NG_CUSTOM_KERNEL=$(CUSTOM_KERNEL); \
-		export CT_NG_CUSTOM_KERNEL_VER=$(CUSTOM_KERNEL_VER); \
-		export LD_LIBRARY_PATH=; \
+		export CT_AAA_ARCHIVE=$(ARCHIVE); \
+		export CT_AAA_BASE_DIR=$(CROSS_BASE); \
+		export CT_AAA_CUSTOM_KERNEL=$(BUILD_TMP)/linux-$(KERNEL_VER).tar.gz; \
+		\
 		test -f ./configure || ./bootstrap && \
 		./configure --enable-local; \
 		MAKELEVEL=0 make; \
@@ -48,16 +44,19 @@ crosstool-ng: $(ARCHIVE)/$(KERNEL_SRC) $(ARCHIVE)/$(CROSSTOOL_NG_SOURCE)
 	test -e $(CROSS_BASE)/$(TARGET)/lib || ln -sf sys-root/lib $(CROSS_BASE)/$(TARGET)/
 	rm -f $(CROSS_BASE)/$(TARGET)/sys-root/lib/libstdc++.so.6.0.20-gdb.py
 	$(REMOVE)/crosstool-ng-git-$(CROSSTOOL_NG_VER)
+	$(REMOVE)/linux-$(KERNEL_VER).tar.gz
 endif
 
 crossmenuconfig: prerequisites | $(ARCHIVE)/$(CROSSTOOL_NG_SOURCE)
-	$(REMOVE)/crosstool-ng-git-$(CROSSTOOL_NG_VER)
+	#$(REMOVE)/crosstool-ng-git-$(CROSSTOOL_NG_VER)
 	$(UNTAR)/$(CROSSTOOL_NG_SOURCE)
 	set -e; unset CONFIG_SITE; cd $(BUILD_TMP)/crosstool-ng-git-$(CROSSTOOL_NG_VER); \
+		cp -a $(PATCHES)/ct-ng/ct-ng-git-$(CROSSTOOL_NG_VER)-$(ARM_GCC_VER)-arm-$(BOXSERIES).config .config; \
 		test -f ./configure || ./bootstrap && \
 		./configure --enable-local; \
 		MAKELEVEL=0 make; \
 		chmod 0755 ct-ng; \
+		./ct-ng upgradeconfig; \
 		./ct-ng menuconfig
 endif
 ###
diff --git a/make/versions.mk b/make/versions.mk
index b8dc266..0c9f641 100644
--- a/make/versions.mk
+++ b/make/versions.mk
@@ -18,13 +18,14 @@ CORTEX_STRINGS_VER = 48fd30c
 # crosstool-ng versions
 CT_NG_VER_HD1 = 1894239
 CT_NG_VER_HD2 = 872341e
-CT_NG_VER_ARM = 872341e
+CT_NG_VER_ARM = afaf7b9
 
 ETHTOOL_VER = 4.17
 
 # Linaro GCC Versions
 GCC_VER_HD1 = linaro-4.9-2017.01
 GCC_VER_HD2 = linaro-6.3-2017.05
+GCC_VER_ARM = gcc-8.3.0
 
 # Dropbear is a relatively small SSH server and client
 DROPBEAR_VER=2018.76
-- 
2.39.5