Updated build to work with make 4.3 and GCC 10.1

Makefile

-all: 12
+all: 13
 
 gcj:
 	$(MAKE) -C ../gcj temporary
@@ -27,12 +27,13 @@ build-9:
 	swapon swap
 	ln -s /opt/jdk/bin/java /usr/bin/java
 	tar xf jdk-9.0.4+11.tar.bz2
+	patch -Np1 -d jdk9u-jdk-9.0.4+11 < jdk9u-jdk-9.0.4+11-make_4_3_fix.patch
 	for subproject in corba hotspot jaxp jaxws jdk langtools nashorn; do \
 	  mkdir -pv jdk9u-jdk-9.0.4+11/$${subproject} ; \
 	  tar -xf jdk/9.0.4+11/$${subproject}.tar.bz2 --strip-components=1 -C jdk9u-jdk-9.0.4+11/$${subproject} ; \
 	done
 	cd jdk9u-jdk-9.0.4+11 && PATH=/build/usr/bin:$$PATH bash configure --enable-unlimited-crypto --disable-warnings-as-errors --with-stdc++lib=dynamic --with-giflib=system --with-lcms=system --with-libjpeg=system --with-libpng=system --with-zlib=system --with-version-build="11" --with-version-pre="" --with-version-opt=""
-	$(MAKE) -C jdk9u-jdk-9.0.4+11 images PATH=/build/usr/bin:$$PATH
+	PATH=/build/usr/bin:$$PATH $(MAKE) -C jdk9u-jdk-9.0.4+11 images
 	mkdir -p /opt/jdk-9.0.4+11
 	cd jdk9u-jdk-9.0.4+11 && cp -Rv build/*/images/jdk/* /opt/jdk-9.0.4+11
 	chown -R root:root /opt/jdk-9.0.4+11
@@ -40,12 +41,12 @@ build-9:
 	ln -sfv -n jdk-9.0.4+11 /opt/jdk
 	rm -f /opt/jdk/lib/security/cacerts
 	ln -svf /etc/ssl/java/cacerts /opt/jdk/lib/security/cacerts
-	rm -rf /opt/icedtea-3.14.0
+	rm -rf /opt/icedtea-3.17.0
 	rm -rf jdk9u-jdk-9.0.4+11
 	swapoff swap
 	rm -rf swap
 
-10: 9 build-10
+10: gcj ant build-6 build-7 build-8 build-9 build-10 clean
 
 build-10:
 	dd if=/dev/zero of=swap bs=1048576 count=1024
@@ -53,8 +54,9 @@ build-10:
 	mkswap swap
 	swapon swap
 	tar xf jdk-10.0.2+13.tar.bz2
+	patch -Np1 -d jdk10u-jdk-10.0.2+13 < jdk10u-jdk-10.0.2+13-make_4_3_fix.patch
 	cd jdk10u-jdk-10.0.2+13 && PATH=/build/usr/bin:$$PATH bash configure --enable-unlimited-crypto --disable-warnings-as-errors --with-stdc++lib=dynamic --with-giflib=system --with-lcms=system --with-libjpeg=system --with-libpng=system --with-zlib=system --with-version-build="13" --with-version-pre="" --with-version-opt=""
-	$(MAKE) -C jdk10u-jdk-10.0.2+13 images PATH=/build/usr/bin:$$PATH
+	PATH=/build/usr/bin:$$PATH $(MAKE) -C jdk10u-jdk-10.0.2+13 images
 	mkdir -p /opt/jdk-10.0.2+13
 	cd jdk10u-jdk-10.0.2+13 && cp -Rv build/*/images/jdk/* /opt/jdk-10.0.2+13
 	chown -R root:root /opt/jdk-10.0.2+13
@@ -67,7 +69,7 @@ build-10:
 	swapoff swap
 	rm -rf swap
 
-11: 10 build-11
+11: gcj ant build-6 build-7 build-8 build-9 build-10 build-11 clean
 
 build-11:
 	dd if=/dev/zero of=swap bs=1048576 count=1024
@@ -75,8 +77,9 @@ build-11:
 	mkswap swap
 	swapon swap
 	tar xf jdk-11.0.2+9.tar.bz2
+	patch -Np1 -d jdk11u-jdk-11.0.2+9 < jdk11u-jdk-11.0.2+9-make_4_3_fix.patch
 	cd jdk11u-jdk-11.0.2+9 && PATH=/build/usr/bin:$$PATH bash configure --enable-unlimited-crypto --disable-warnings-as-errors --with-stdc++lib=dynamic --with-giflib=system --with-lcms=system --with-libjpeg=system --with-libpng=system --with-zlib=system --with-version-build="13" --with-version-pre="" --with-version-opt=""
-	$(MAKE) -C jdk11u-jdk-11.0.2+9 images PATH=/build/usr/bin:$$PATH
+	PATH=/build/usr/bin:$$PATH $(MAKE) -C jdk11u-jdk-11.0.2+9 images
 	mkdir -p /opt/jdk-11.0.2+9
 	cd jdk11u-jdk-11.0.2+9 && cp -Rv build/*/images/jdk/* /opt/jdk-11.0.2+9
 	chown -R root:root /opt/jdk-11.0.2+9
@@ -89,7 +92,7 @@ build-11:
 	swapoff swap
 	rm -rf swap
 
-12: 11 build-12
+12: gcj ant build-6 build-7 build-8 build-9 build-10 build-11 build-12 clean
 
 build-12:
 	dd if=/dev/zero of=swap bs=1048576 count=1024
@@ -97,8 +100,9 @@ build-12:
 	mkswap swap
 	swapon swap
 	tar xf jdk-12.0.2+10.tar.bz2
+	patch -Np1 -d jdk12u-jdk-12.0.2+10 < jdk12u-jdk-12.0.2+10-make_4_3_fix.patch
 	cd jdk12u-jdk-12.0.2+10 && PATH=/build/usr/bin:$$PATH bash configure --enable-unlimited-crypto --disable-warnings-as-errors --with-stdc++lib=dynamic --with-giflib=system --with-lcms=system --with-libjpeg=system --with-libpng=system --with-zlib=system --with-version-build="13" --with-version-pre="" --with-version-opt=""
-	$(MAKE) -C jdk12u-jdk-12.0.2+10 images PATH=/build/usr/bin:$$PATH
+	PATH=/build/usr/bin:$$PATH $(MAKE) -C jdk12u-jdk-12.0.2+10 images
 	mkdir -p /opt/jdk-12.0.2+10
 	cd jdk12u-jdk-12.0.2+10 && cp -Rv build/*/images/jdk/* /opt/jdk-12.0.2+10
 	chown -R root:root /opt/jdk-12.0.2+10
@@ -119,8 +123,9 @@ build-13:
 	mkswap swap
 	swapon swap
 	tar xf jdk-13.0.2+8.tar.bz2
-	cd jdk13u-jdk-13.0.2+8 && PATH=/build/usr/bin:$$PATH bash configure --enable-unlimited-crypto --disable-warnings-as-errors --with-stdc++lib=dynamic --with-giflib=system --with-lcms=system --with-libjpeg=system --with-libpng=system --with-zlib=system --with-version-build="13" --with-version-pre="" --with-version-opt=""
-	$(MAKE) -C jdk13u-jdk-13.0.2+8 images PATH=/build/usr/bin:$$PATH
+	patch -Np1 -d jdk13u-jdk-13.0.2+8 < jdk13u-jdk-13.0.2+8-make_4_3_fix.patch
+	cd jdk13u-jdk-13.0.2+8 && bash configure --enable-unlimited-crypto --disable-warnings-as-errors --with-stdc++lib=dynamic --with-giflib=system --with-lcms=system --with-libjpeg=system --with-libpng=system --with-zlib=system --with-version-build="13" --with-version-pre="" --with-version-opt="" --with-extra-cflags="-fcommon"
+	$(MAKE) -C jdk13u-jdk-13.0.2+8 images
 	mkdir -p /opt/jdk-13.0.2+8
 	cd jdk13u-jdk-13.0.2+8 && cp -Rv build/*/images/jdk/* /opt/jdk-13.0.2+8
 	chown -R root:root /opt/jdk-13.0.2+8

jdk10u-jdk-10.0.2+13-make_4_3_fix.patch

+diff -uNr jdk10u-jdk-10.0.2+13/make/common/MakeBase.gmk jdk10u-jdk-10.0.2+13-make_4_3_fix/make/common/MakeBase.gmk
+--- jdk10u-jdk-10.0.2+13/make/common/MakeBase.gmk	2018-06-24 23:37:06.000000000 +0930
++++ jdk10u-jdk-10.0.2+13-make_4_3_fix/make/common/MakeBase.gmk	2021-08-09 09:20:34.806679144 +0930
+@@ -960,15 +960,16 @@
+ # Param 2 - (optional) name of file to store value in
+ DependOnVariableHelper = \
+     $(strip \
+-        $(eval -include $(call DependOnVariableFileName, $1, $2)) \
++        $(eval $1_filename := $(call DependOnVariableFileName, $1, $2)) \
++        $(if $(wildcard $($1_filename)), $(eval include $($1_filename))) \
+         $(if $(call equals, $(strip $($1)), $(strip $($1_old))),,\
+-          $(call MakeDir, $(dir $(call DependOnVariableFileName, $1, $2))) \
++          $(call MakeDir, $(dir $($1_filename))) \
+           $(if $(findstring $(LOG_LEVEL), trace), \
+               $(info NewVariable $1: >$(strip $($1))<) \
+               $(info OldVariable $1: >$(strip $($1_old))<)) \
+           $(call WriteFile, $1_old:=$(call DoubleDollar,$(call EscapeHash,$($1))), \
+-              $(call DependOnVariableFileName, $1, $2))) \
+-        $(call DependOnVariableFileName, $1, $2) \
++              $($1_filename))) \
++        $($1_filename) \
+     )
+ 
+ # Main macro

jdk11u-jdk-11.0.2+9-make_4_3_fix.patch

+diff -uNr jdk11u-jdk-11.0.2+9/make/common/MakeBase.gmk jdk11u-jdk-11.0.2+9-make_4_3_fix/make/common/MakeBase.gmk
+--- jdk11u-jdk-11.0.2+9/make/common/MakeBase.gmk	2019-01-18 14:53:48.000000000 +1030
++++ jdk11u-jdk-11.0.2+9-make_4_3_fix/make/common/MakeBase.gmk	2021-08-12 19:13:26.224474772 +0930
+@@ -973,15 +973,16 @@
+ # Param 2 - (optional) name of file to store value in
+ DependOnVariableHelper = \
+     $(strip \
+-        $(eval -include $(call DependOnVariableFileName, $1, $2)) \
++        $(eval $1_filename := $(call DependOnVariableFileName, $1, $2)) \
++        $(if $(wildcard $($1_filename)), $(eval include $($1_filename))) \
+         $(if $(call equals, $(strip $($1)), $(strip $($1_old))),,\
+-          $(call MakeDir, $(dir $(call DependOnVariableFileName, $1, $2))) \
++          $(call MakeDir, $(dir $($1_filename))) \
+           $(if $(findstring $(LOG_LEVEL), trace), \
+               $(info NewVariable $1: >$(strip $($1))<) \
+               $(info OldVariable $1: >$(strip $($1_old))<)) \
+           $(call WriteFile, $1_old:=$(call DoubleDollar,$(call EscapeHash,$($1))), \
+-              $(call DependOnVariableFileName, $1, $2))) \
+-        $(call DependOnVariableFileName, $1, $2) \
++              $($1_filename))) \
++        $($1_filename) \
+     )
+ 
+ # Main macro

jdk12u-jdk-12.0.2+10-make_4_3_fix.patch

+diff -uNr jdk12u-jdk-12.0.2+10/make/common/MakeBase.gmk jdk12u-jdk-12.0.2+10-make_4_3_fix/make/common/MakeBase.gmk
+--- jdk12u-jdk-12.0.2+10/make/common/MakeBase.gmk	2019-07-17 02:08:28.000000000 +0930
++++ jdk12u-jdk-12.0.2+10-make_4_3_fix/make/common/MakeBase.gmk	2021-08-14 05:04:47.665494171 +0930
+@@ -977,15 +977,16 @@
+ # Param 2 - (optional) name of file to store value in
+ DependOnVariableHelper = \
+     $(strip \
+-        $(eval -include $(call DependOnVariableFileName, $1, $2)) \
++        $(eval $1_filename := $(call DependOnVariableFileName, $1, $2)) \
++        $(if $(wildcard $($1_filename)), $(eval include $($1_filename))) \
+         $(if $(call equals, $(strip $($1)), $(strip $($1_old))),,\
+-          $(call MakeDir, $(dir $(call DependOnVariableFileName, $1, $2))) \
++          $(call MakeDir, $(dir $($1_filename))) \
+           $(if $(findstring $(LOG_LEVEL), trace), \
+               $(info NewVariable $1: >$(strip $($1))<) \
+               $(info OldVariable $1: >$(strip $($1_old))<)) \
+           $(call WriteFile, $1_old:=$(call DoubleDollar,$(call EscapeHash,$($1))), \
+-              $(call DependOnVariableFileName, $1, $2))) \
+-        $(call DependOnVariableFileName, $1, $2) \
++              $($1_filename))) \
++        $($1_filename) \
+     )
+ 
+ # Main macro

jdk13u-jdk-13.0.2+8-make_4_3_fix.patch

+diff -uNr jdk13u-jdk-13.0.2+8/make/common/MakeBase.gmk jdk13u-jdk-13.0.2+8-make_4_3_fix/make/common/MakeBase.gmk
+--- jdk13u-jdk-13.0.2+8/make/common/MakeBase.gmk	2019-11-29 07:02:27.000000000 +1030
++++ jdk13u-jdk-13.0.2+8-make_4_3_fix/make/common/MakeBase.gmk	2021-08-16 13:45:02.551677263 +0930
+@@ -525,15 +525,16 @@
+ # Param 2 - (optional) name of file to store value in
+ DependOnVariableHelper = \
+     $(strip \
+-        $(eval -include $(call DependOnVariableFileName, $1, $2)) \
++        $(eval $1_filename := $(call DependOnVariableFileName, $1, $2)) \
++        $(if $(wildcard $($1_filename)), $(eval include $($1_filename))) \
+         $(if $(call equals, $(strip $($1)), $(strip $($1_old))),,\
+-          $(call MakeDir, $(dir $(call DependOnVariableFileName, $1, $2))) \
++          $(call MakeDir, $(dir $($1_filename))) \
+           $(if $(findstring $(LOG_LEVEL), trace), \
+               $(info NewVariable $1: >$(strip $($1))<) \
+               $(info OldVariable $1: >$(strip $($1_old))<)) \
+           $(call WriteFile, $1_old:=$(call DoubleDollar,$(call EscapeHash,$($1))), \
+-              $(call DependOnVariableFileName, $1, $2))) \
+-        $(call DependOnVariableFileName, $1, $2) \
++              $($1_filename))) \
++        $($1_filename) \
+     )
+ 
+ # Main macro

jdk9u-jdk-9.0.4+11-make_4_3_fix.patch

+diff -uNr jdk9u-jdk-9.0.4+11/make/common/MakeBase.gmk jdk9u-jdk-9.0.4+11-make_4_3_fix/make/common/MakeBase.gmk
+--- jdk9u-jdk-9.0.4+11/make/common/MakeBase.gmk	2017-12-14 16:01:15.000000000 +1030
++++ jdk9u-jdk-9.0.4+11-make_4_3_fix/make/common/MakeBase.gmk	2021-08-06 13:06:28.745325692 +0930
+@@ -897,15 +897,16 @@
+ # Param 2 - (optional) name of file to store value in
+ DependOnVariableHelper = \
+     $(strip \
+-        $(eval -include $(call DependOnVariableFileName, $1, $2)) \
++        $(eval $1_filename := $(call DependOnVariableFileName, $1, $2)) \
++        $(if $(wildcard $($1_filename)), $(eval include $($1_filename))) \
+         $(if $(call equals, $(strip $($1)), $(strip $($1_old))),,\
+-          $(call MakeDir, $(dir $(call DependOnVariableFileName, $1, $2))) \
++          $(call MakeDir, $(dir $($1_filename))) \
+           $(if $(findstring $(LOG_LEVEL), trace), \
+               $(info NewVariable $1: >$(strip $($1))<) \
+               $(info OldVariable $1: >$(strip $($1_old))<)) \
+           $(call WriteFile, $1_old:=$(call DoubleDollar,$(call EscapeHash,$($1))), \
+-              $(call DependOnVariableFileName, $1, $2))) \
+-        $(call DependOnVariableFileName, $1, $2) \
++              $($1_filename))) \
++        $($1_filename) \
+     )
+ 
+ # Main macro