diff options
| author | Tijl Coosemans <tijl@FreeBSD.org> | 2020-05-09 19:24:49 +0000 |
|---|---|---|
| committer | Tijl Coosemans <tijl@FreeBSD.org> | 2020-05-09 19:24:49 +0000 |
| commit | 7d4723292c529621329dafb7fc2aa27183da1eae (patch) | |
| tree | ebef050ddf7b410c892c5607cd95abafad473cce /java/openjdk13 | |
| parent | Update to 6.14.1 (diff) | |
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)
Notes
Notes:
svn path=/head/; revision=534792
Diffstat (limited to 'java/openjdk13')
| -rw-r--r-- | java/openjdk13/files/patch-10-af5c725b | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/java/openjdk13/files/patch-10-af5c725b b/java/openjdk13/files/patch-10-af5c725b new file mode 100644 index 000000000000..0e4ec063a266 --- /dev/null +++ b/java/openjdk13/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 |