Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/build-support/java12-openjdk/jdk12u-jdk-12.0.2+10-make43.patch
blob: 998afc6bd0bcb9d6a553aa1a45e9c99eaa4534fd (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
diff -rauN jdk12u-jdk-12.0.2+10/make/common/MakeBase.gmk jdk12u-jdk-12.0.2+10-make43-patch/make/common/MakeBase.gmk
--- jdk12u-jdk-12.0.2+10/make/common/MakeBase.gmk	2019-07-16 18:38:28.000000000 +0200
+++ jdk12u-jdk-12.0.2+10-make43-patch/make/common/MakeBase.gmk	2021-05-19 14:33:26.193326369 +0200
@@ -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