summaryrefslogtreecommitdiff
path: root/build-support/java9-openjdk/jdk9u-jdk-9.0.4+12-make43.patch
diff options
context:
space:
mode:
Diffstat (limited to 'build-support/java9-openjdk/jdk9u-jdk-9.0.4+12-make43.patch')
-rw-r--r--build-support/java9-openjdk/jdk9u-jdk-9.0.4+12-make43.patch24
1 files changed, 24 insertions, 0 deletions
diff --git a/build-support/java9-openjdk/jdk9u-jdk-9.0.4+12-make43.patch b/build-support/java9-openjdk/jdk9u-jdk-9.0.4+12-make43.patch
new file mode 100644
index 00000000..b8440634
--- /dev/null
+++ b/build-support/java9-openjdk/jdk9u-jdk-9.0.4+12-make43.patch
@@ -0,0 +1,24 @@
+diff -rauN jdk9u-jdk-9.0.4+12/make/common/MakeBase.gmk jdk9u-jdk-9.0.4+12-make43-patch/make/common/MakeBase.gmk
+--- jdk9u-jdk-9.0.4+12/make/common/MakeBase.gmk 2017-12-20 00:25:20.000000000 +0100
++++ jdk9u-jdk-9.0.4+12-make43-patch/make/common/MakeBase.gmk 2021-05-16 08:48:07.503289305 +0200
+@@ -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