diff --git a/srcpkgs/openjdk15-bootstrap/patches/test-glibc2.34.patch b/srcpkgs/openjdk15-bootstrap/patches/test-glibc2.34.patch
new file mode 100644
index 00000000000..3e127093d09
--- /dev/null
+++ b/srcpkgs/openjdk15-bootstrap/patches/test-glibc2.34.patch
@@ -0,0 +1,33 @@
+From f77a1a156f3da9068d012d9227c7ee0fee58f571 Mon Sep 17 00:00:00 2001
+From: David Holmes <dholmes@openjdk.org>
+Date: Sun, 22 Aug 2021 01:13:27 +0000
+Subject: [PATCH] 8272472: StackGuardPages test doesn't build with glibc 2.34
+
+Reviewed-by: shade, stuefe, jiefu
+---
+ .../jtreg/runtime/StackGuardPages/exeinvoke.c       | 13 +++++++++++--
+ 1 file changed, 11 insertions(+), 2 deletions(-)
+
+diff --git a/test/hotspot/jtreg/runtime/StackGuardPages/exeinvoke.c b/test/hotspot/jtreg/runtime/StackGuardPages/exeinvoke.c
+index a46f1cef44c78..50a37001fbf33 100644
+--- a/openjdk/test/hotspot/jtreg/runtime/StackGuardPages/exeinvoke.c
++++ b/openjdk/test/hotspot/jtreg/runtime/StackGuardPages/exeinvoke.c
+@@ -68,8 +68,17 @@ static void handler(int sig, siginfo_t *si, void *unused) {
+   longjmp(context, 1);
+ }
+ 
++static char* altstack = NULL;
++
+ void set_signal_handler() {
+-  static char altstack[SIGSTKSZ];
++  if (altstack == NULL) {
++    // Dynamically allocated in case SIGSTKSZ is not constant
++    altstack = malloc(SIGSTKSZ);
++    if (altstack == NULL) {
++      fprintf(stderr, "Test ERROR. Unable to malloc altstack space\n");
++      exit(7);
++    }
++  }
+ 
+   stack_t ss = {
+     .ss_size = SIGSTKSZ,
diff --git a/srcpkgs/openjdk15-bootstrap/template b/srcpkgs/openjdk15-bootstrap/template
index ec9b2fbaf69..99ad86fae67 100644
--- a/srcpkgs/openjdk15-bootstrap/template
+++ b/srcpkgs/openjdk15-bootstrap/template
@@ -1,7 +1,7 @@
 # Template file for 'openjdk15-bootstrap'
 pkgname=openjdk15-bootstrap
 version=15.0.3+3
-revision=1
+revision=2
 _java_ver="${version%%.*}"
 _jdk_update="${version#*+}"
 _base_version="${version%+*}"
@@ -41,9 +41,9 @@ short_desc="OpenJDK Java Development Kit (bootstrap version 15)"
 maintainer="classabbyamp <void@placeviolette.net>"
 license="GPL-2.0-only WITH Classpath-exception-2.0"
 homepage="http://openjdk.java.net/"
-distfiles="https://hg.openjdk.java.net/jdk-updates/jdk${_java_ver}u/archive/jdk-${version}.tar.gz
+distfiles="https://github.com/openjdk/jdk${_java_ver}u/archive/refs/tags/jdk-${version}.tar.gz
  https://github.com/google/googletest/archive/refs/tags/release-1.8.1.tar.gz"
-checksum="9d90fc543c092f1bb399e674929088df5969bf7297bb9e607257d4edf6fc91f9
+checksum="fa931722093d3c42b7a1a28bc41933af4a6a4c84f1ac5cd167b82283e09ccc05
  9bf1fe5182a604b4135edc1a425ae356c9ad15e9b23f9f12a02e80184c3a249c"
 provides="java-environment-${version}_1 java-runtime-${version}_1"
 nocross=yes
@@ -51,6 +51,7 @@ repository=bootstrap
 
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes
+disable_parallel_check=yes
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;