From 675fd30ab4d682ecfa4a2da4c46e74dc5d876e3c Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 14 Oct 2023 04:48:00 -0400
Subject: [PATCH] openjdk9-bootstrap: fix checksums, build

---
 .../openjdk9-bootstrap/patches/make-4.3.patch | 20 +++++++++++++++++++
 srcpkgs/openjdk9-bootstrap/template           | 16 +++++++--------
 2 files changed, 28 insertions(+), 8 deletions(-)
 create mode 100644 srcpkgs/openjdk9-bootstrap/patches/make-4.3.patch

diff --git a/srcpkgs/openjdk9-bootstrap/patches/make-4.3.patch b/srcpkgs/openjdk9-bootstrap/patches/make-4.3.patch
new file mode 100644
index 00000000000..2ee8814926b
--- /dev/null
+++ b/srcpkgs/openjdk9-bootstrap/patches/make-4.3.patch
@@ -0,0 +1,20 @@
+Subject: Fix build error with make >= 4.3
+Upstream: Yes
+Upstream-Url: https://bugs.openjdk.java.net/browse/JDK-8237879
+Author: Simon Frankenberger <simon-alpine@fraho.eu>
+
+diff --git a/make/common/MakeBase.gmk b/make/common/MakeBase.gmk
+index 170c3ed..697f9d2 100644
+--- a/make/common/MakeBase.gmk
++++ b/make/common/MakeBase.gmk
+@@ -904,7 +904,9 @@ DependOnVariableHelper = \
+               $(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)) \
++              $(eval $(call DependOnVariableFileName, $1, $2): ) \
++        ) \
+         $(call DependOnVariableFileName, $1, $2) \
+     )
+ 
diff --git a/srcpkgs/openjdk9-bootstrap/template b/srcpkgs/openjdk9-bootstrap/template
index 6d85e3e6f17..c50cc4adc7e 100644
--- a/srcpkgs/openjdk9-bootstrap/template
+++ b/srcpkgs/openjdk9-bootstrap/template
@@ -43,14 +43,14 @@ distfiles="
  http://hg.openjdk.java.net/jdk-updates/jdk9u/nashorn/archive/jdk-${_repo_ver}.tar.bz2>jdk-${_repo_ver}-nashorn.tar.bz2"
 repository=bootstrap
 
-checksum="914183a7eac6a1dfdfa70a98ceb4262244c77ab904c4570bb34c609ecb5f0986
- 3807400280a3b92e9dd23fcdd76482162ce54af6fbbaa0777cb6235ad6a66fea
- e1da0455cb546666494d6a07f263f9af5dd2772c37d89db552dcae48339b9e2f
- 0021cc00f8ebc35e5a2cc9e8ceffcaf1620499a6eb922937bf7bc0d44a49bab6
- d71476426c346cfc819f03521f3d3dc60cae9d5dd09e7e3d1d0f4990107d42a7
- b7e42590a81f0e3a681f663efe89cad4c1d7041700832d90b421bb2bbe7f2d1a
- 9cba7f03ebeda4d3cfaffb015f9bf967fcca2c3c113604836073556df6a7b9aa
- c939de46f903ecb283c02155e1415cee98ab66803e17eae0403c399c1a475647"
+checksum="c27ceccaa9461bebb385739ecb016f275a8a293551db81ad9a0a68be0441b9a4
+ b20aedbda5ccb81e3261343ba9cce1b9a8f5f50b283469a2093db312502edd84
+ a6fe7dbec05cf0568a1584ef401e6ae4c3d06cedc5958b7b46ead42ec3339324
+ 1a7a6674ac3a1b988886ce4e5b7c7ae640584a9d50e552e05df69e2a0f5ab551
+ 09ae3324a4a93f5029f530bdee047687eadd7bf5fe6990b567116bef75b539d7
+ cf3f2d4a0f43f1f5622513402689d2ad5b74c76c3d12badc6e8db7558f722c8c
+ a1d8cafd40d5b26c09a32b8e14bc5cc79de95eb2876ea11881730b737a9f503b
+ 2e5ab48bbf2bbf930488a38113710ce297cb6a08ac57df9b5b1af334161e8a77"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;