From 1d8e591a2d8d203f8d3c2a464c16ef97adef3962 Mon Sep 17 00:00:00 2001
From: Severin Gehwolf <sgehwolf@redhat.com>
Date: Fri, 13 Mar 2020 17:54:50 +0100
Subject: [PATCH] Add JDK-8237879 so as to be able to build with make 4.3

---
 java-11-openjdk.spec                  |  8 ++++++-
 jdk8237879-make_4_3_build_fixes.patch | 34 +++++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 jdk8237879-make_4_3_build_fixes.patch

diff --git a/java-11-openjdk.spec b/java-11-openjdk.spec
index ecdfd82..bd19d05 100644
--- a/java-11-openjdk.spec
+++ b/java-11-openjdk.spec
@@ -223,7 +223,7 @@
 %global top_level_dir_name   %{origin}
 %global minorver        0
 %global buildver        2
-%global rpmrelease      0
+%global rpmrelease      1
 #%%global tagsuffix      ""
 # priority must be 8 digits in total; untill openjdk 1.8 we were using 18..... so when moving to 11 we had to add another digit
 %if %is_system_jdk
@@ -1056,6 +1056,8 @@ Patch6:    rh1566890-CVE_2018_3639-speculative_store_bypass.patch
 Patch7: pr3695-toggle_system_crypto_policy.patch
 # S390 ambiguous log2_intptr call
 Patch8: s390-8214206_fix.patch
+# JDK-8237879: make 4.3 breaks build
+Patch9: jdk8237879-make_4_3_build_fixes.patch
 
 #############################################
 #
@@ -1291,6 +1293,7 @@ pushd %{top_level_dir_name}
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 popd # openjdk
 
 %patch1000
@@ -1839,6 +1842,9 @@ require "copy_jdk_configs.lua"
 
 
 %changelog
+* Fri Mar 13 2020 Severin Gehwolf <sgehwolf@redhat.com> - 1:11.0.7.2-0.1.ea
+- Add patch for make 4.3 (JDK-8237879)
+
 * Wed Mar 04 2020 Andrew John Hughes <gnu.andrew@redhat.com> - 1:11.0.7.2-0.0.ea
 - Update to shenandoah-jdk-11.0.7+2 (EA)
 - Drop JDK-8224851 backport now included upstream.
diff --git a/jdk8237879-make_4_3_build_fixes.patch b/jdk8237879-make_4_3_build_fixes.patch
new file mode 100644
index 0000000..76da003
--- /dev/null
+++ b/jdk8237879-make_4_3_build_fixes.patch
@@ -0,0 +1,34 @@
+
+# HG changeset patch
+# User ihse
+# Date 1580378910 -3600
+# Node ID 0743e1d49930a95d045bfdaa8f8607a00289e677
+# Parent  24b4c763cb2276db073bec263246879eb312daeb
+8237879: make 4.3 breaks build
+Reviewed-by: erikj, tbell
+
+diff -r 24b4c763cb22 -r 0743e1d49930 make/common/MakeBase.gmk
+--- a/make/common/MakeBase.gmk	Thu Jan 30 10:10:48 2020 +0100
++++ b/make/common/MakeBase.gmk	Thu Jan 30 11:08:30 2020 +0100
+@@ -525,15 +525,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
+