From: Georgy Yakovlev <gyakovlev@gentoo.org>
Date: Tue, 28 Jan 2020 09:21:36 +0000 (-0800)
Subject: dev-java/openjdk: add patch to fix build with make-4.3
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b1ef64c6d48de6bb0e3bd1155ace461ed17d0893;p=gentoo.git

dev-java/openjdk: add patch to fix build with make-4.3

Bug: https://bugs.gentoo.org/706012
Thanks-to: Alex Parker <alex.iris.parker@gmail.com>
Package-Manager: Portage-2.3.86, Repoman-2.3.20
Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>
---

diff --git a/dev-java/openjdk/files/openjdk-11-make43.patch b/dev-java/openjdk/files/openjdk-11-make43.patch
new file mode 100644
index 000000000000..9466e2be56fb
--- /dev/null
+++ b/dev-java/openjdk/files/openjdk-11-make43.patch
@@ -0,0 +1,12 @@
+diff --git a/make/common/MakeBase.gmk b/make/common/MakeBase.gmk
+index 170c3ed..b3b49f1 100644
+--- a/make/common/MakeBase.gmk
++++ b/make/common/MakeBase.gmk
+@@ -974,6 +974,7 @@ DependOnVariableFileName = \
+ # Param 2 - (optional) name of file to store value in
+ DependOnVariableHelper = \
+     $(strip \
++        $(eval $(call DependOnVariableFileName, $1, $2):$(NEWLINE)	true) \
+         $(eval -include $(call DependOnVariableFileName, $1, $2)) \
+         $(if $(call equals, $(strip $($1)), $(strip $($1_old))),,\
+           $(call MakeDir, $(dir $(call DependOnVariableFileName, $1, $2))) \
diff --git a/dev-java/openjdk/openjdk-11.0.6.ebuild b/dev-java/openjdk/openjdk-11.0.6.ebuild
index c5cf008ef3e2..f98807e652b0 100644
--- a/dev-java/openjdk/openjdk-11.0.6.ebuild
+++ b/dev-java/openjdk/openjdk-11.0.6.ebuild
@@ -73,6 +73,8 @@ PDEPEND="
 
 REQUIRED_USE="javafx? ( alsa !headless-awt )"
 
+PATCHES=( "${FILESDIR}/openjdk-11-make43.patch" )
+
 S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV}"
 
 # The space required to build varies wildly depending on USE flags,