From ad917e8cd81fc8e72727d85e182b7f282694a83d Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Wed, 29 May 2024 21:33:27 -0400 Subject: [PATCH] openjdk14-bootstrap: move to github distfiles, fix check hg.openjdk.java.net is gone --- .../patches/test-glibc2.34.patch | 33 +++++++++++++++++++ srcpkgs/openjdk14-bootstrap/template | 7 ++-- 2 files changed, 37 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/openjdk14-bootstrap/patches/test-glibc2.34.patch diff --git a/srcpkgs/openjdk14-bootstrap/patches/test-glibc2.34.patch b/srcpkgs/openjdk14-bootstrap/patches/test-glibc2.34.patch new file mode 100644 index 00000000000..b6ef9860d18 --- /dev/null +++ b/srcpkgs/openjdk14-bootstrap/patches/test-glibc2.34.patch @@ -0,0 +1,33 @@ +From f77a1a156f3da9068d012d9227c7ee0fee58f571 Mon Sep 17 00:00:00 2001 +From: David Holmes +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/test/hotspot/jtreg/runtime/StackGuardPages/exeinvoke.c ++++ b/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/openjdk14-bootstrap/template b/srcpkgs/openjdk14-bootstrap/template index 6b08462ed12..d8f867c88d7 100644 --- a/srcpkgs/openjdk14-bootstrap/template +++ b/srcpkgs/openjdk14-bootstrap/template @@ -1,7 +1,7 @@ # Template file for 'openjdk14-bootstrap' pkgname=openjdk14-bootstrap version=14.0.2+12 -revision=1 +revision=2 _java_ver="${version%%.*}" _jdk_update="${version#*+}" _base_version="${version%+*}" @@ -38,14 +38,15 @@ short_desc="OpenJDK Java Development Kit (bootstrap version 14)" maintainer="classabbyamp " 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" -checksum=72a7e129235c9a71405a9d97e095fa554b21ddb9f2a37d03cbee2bdcb695a0ec +distfiles="https://github.com/openjdk/jdk${_java_ver}u/archive/refs/tags/jdk-${version}.tar.gz" +checksum=582e3d805ab74582332250f95f9845608c8f3d3273aa92af6f683c45d1a4f8e8 provides="java-environment-${version}_1 java-runtime-${version}_1" nocross=yes 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*) ;;