From 7d4723292c529621329dafb7fc2aa27183da1eae Mon Sep 17 00:00:00 2001 From: Tijl Coosemans Date: Sat, 9 May 2020 19:24:49 +0000 Subject: Update devel/gmake to 4.3. Some changes have been made in this release that break backwards compatibility. Let USES=gmake force users to upgrade to this version so port maintainers don't have to support older versions. PR: 245725 Exp-run by: antoine Approved by: portmgr (antoine) --- java/openjdk12/files/patch-10-af5c725b | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 java/openjdk12/files/patch-10-af5c725b (limited to 'java/openjdk12/files/patch-10-af5c725b') diff --git a/java/openjdk12/files/patch-10-af5c725b b/java/openjdk12/files/patch-10-af5c725b new file mode 100644 index 000000000000..0e4ec063a266 --- /dev/null +++ b/java/openjdk12/files/patch-10-af5c725b @@ -0,0 +1,25 @@ +diff --git a/make/common/MakeBase.gmk b/make/common/MakeBase.gmk +index 8de519fc606..221e9455960 100644 +--- make/common/MakeBase.gmk ++++ make/common/MakeBase.gmk +@@ -525,15 +525,16 @@ DependOnVariableFileName = \ + # 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 -- cgit v1.2.3