up to 9.0.4.12

[packages/openjdk9.git] / make-4.3.patch

diff --git a/make-4.3.patch b/make-4.3.patch
new file mode 100644 (file)
index 0000000..742c753
--- /dev/null
+++ b/make-4.3.patch
@@ -0,0 +1,34 @@
+
+# HG changeset patch
+# User ihse
+# Date 1580378910 -3600
+# Node ID 0a3f080b7f94e194efd98e45a11ac847d5b3291a
+# Parent  f6ebf6148ff0ca648ea0574469091d481dd965d0
+8237879: make 4.3 breaks build
+Reviewed-by: erikj, tbell
+
+diff -r f6ebf6148ff0 -r 0a3f080b7f94 make/common/MakeBase.gmk
+--- a/make/common/MakeBase.gmk Mon Feb 03 09:39:39 2020 +0100
++++ b/make/common/MakeBase.gmk Thu Jan 30 11:08:30 2020 +0100
+@@ -1036,15 +1036,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
+