From a12c2576b2149fd66d7c9308cab9852e6d452e8e Mon Sep 17 00:00:00 2001
From: Petra Mikova <pmikova@redhat.com>
Date: Fri, 13 Mar 2020 07:26:59 +0100
Subject: [PATCH] Fix make 4.3 build issues

JDK-8237879 causes build issues because of changes in make
---
 java-latest-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-latest-openjdk.spec b/java-latest-openjdk.spec
index bf1f3ca..d3898e4 100644
--- a/java-latest-openjdk.spec
+++ b/java-latest-openjdk.spec
@@ -219,7 +219,7 @@
 %global top_level_dir_name   %{origin}
 %global minorver        0
 %global buildver        8
-%global rpmrelease      3
+%global rpmrelease      4
 # priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit
 %if %is_system_jdk
 %global priority %( printf '%02d%02d%02d%02d' %{majorver} %{minorver} %{securityver} %{buildver} )
@@ -1050,6 +1050,8 @@ Patch6: rh1684077-openjdk_should_depend_on_pcsc-lite-libs_instead_of_pcsc-lite-d
 
 # JDK-8224851: AArch64: fix warnings and errors with Clang and GCC 8.3
 Patch7: jdk8224851-aarch64_compiler_fixes.patch 
+# JDK-8237879: make 4.3 breaks build
+Patch8: jdk8237879-make_4_3_build_fixes.patch
 
 BuildRequires: autoconf
 BuildRequires: automake
@@ -1277,6 +1279,7 @@ pushd %{top_level_dir_name}
 %patch4 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 popd # openjdk
 
 %patch1000
@@ -1825,6 +1828,9 @@ require "copy_jdk_configs.lua"
 
 
 %changelog
+* Thu Mar 12 2020 Petra Alice Mikova <pmikova@redhat.com> - 1:13.0.2.8-4.rolling
+- add patch for build issues with make 4.3
+
 * Thu Feb 27 2020 Severin Gehwolf <sgehwolf@redhat.com> - 1:13.0.2.8-3.rolling
 - add workaround for issues with build with GCC10 on s390x (see RHBZ#1799531)
 - fix issues with build with GCC10: JDK-8224851, -fcommon switch
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
+