| 1 |
commit: b1ef64c6d48de6bb0e3bd1155ace461ed17d0893 |
| 2 |
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jan 28 09:21:36 2020 +0000 |
| 4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jan 28 09:21:36 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1ef64c6 |
| 7 |
|
| 8 |
dev-java/openjdk: add patch to fix build with make-4.3 |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/706012 |
| 11 |
Thanks-to: Alex Parker <alex.iris.parker <AT> gmail.com> |
| 12 |
Package-Manager: Portage-2.3.86, Repoman-2.3.20 |
| 13 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
| 14 |
|
| 15 |
dev-java/openjdk/files/openjdk-11-make43.patch | 12 ++++++++++++ |
| 16 |
dev-java/openjdk/openjdk-11.0.6.ebuild | 2 ++ |
| 17 |
2 files changed, 14 insertions(+) |
| 18 |
|
| 19 |
diff --git a/dev-java/openjdk/files/openjdk-11-make43.patch b/dev-java/openjdk/files/openjdk-11-make43.patch |
| 20 |
new file mode 100644 |
| 21 |
index 00000000000..9466e2be56f |
| 22 |
--- /dev/null |
| 23 |
+++ b/dev-java/openjdk/files/openjdk-11-make43.patch |
| 24 |
@@ -0,0 +1,12 @@ |
| 25 |
+diff --git a/make/common/MakeBase.gmk b/make/common/MakeBase.gmk |
| 26 |
+index 170c3ed..b3b49f1 100644 |
| 27 |
+--- a/make/common/MakeBase.gmk |
| 28 |
++++ b/make/common/MakeBase.gmk |
| 29 |
+@@ -974,6 +974,7 @@ DependOnVariableFileName = \ |
| 30 |
+ # Param 2 - (optional) name of file to store value in |
| 31 |
+ DependOnVariableHelper = \ |
| 32 |
+ $(strip \ |
| 33 |
++ $(eval $(call DependOnVariableFileName, $1, $2):$(NEWLINE) true) \ |
| 34 |
+ $(eval -include $(call DependOnVariableFileName, $1, $2)) \ |
| 35 |
+ $(if $(call equals, $(strip $($1)), $(strip $($1_old))),,\ |
| 36 |
+ $(call MakeDir, $(dir $(call DependOnVariableFileName, $1, $2))) \ |
| 37 |
|
| 38 |
diff --git a/dev-java/openjdk/openjdk-11.0.6.ebuild b/dev-java/openjdk/openjdk-11.0.6.ebuild |
| 39 |
index c5cf008ef3e..f98807e652b 100644 |
| 40 |
--- a/dev-java/openjdk/openjdk-11.0.6.ebuild |
| 41 |
+++ b/dev-java/openjdk/openjdk-11.0.6.ebuild |
| 42 |
@@ -73,6 +73,8 @@ PDEPEND=" |
| 43 |
|
| 44 |
REQUIRED_USE="javafx? ( alsa !headless-awt )" |
| 45 |
|
| 46 |
+PATCHES=( "${FILESDIR}/openjdk-11-make43.patch" ) |
| 47 |
+ |
| 48 |
S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV}" |
| 49 |
|
| 50 |
# The space required to build varies wildly depending on USE flags, |
Archives