gnu: openjdk10: Add patches to fix build.
* gnu/packages/patches/openjdk-10-pointer-comparison.patch, gnu/packages/patches/openjdk-10-setsignalhandler.patch: New files. * gnu/local.mk (dist_patch_DATA): Register patches. * gnu/packages/java.scm (openjdk10)[origin]: Use patches.master
parent
b7c8a69fd8
commit
a0cf2bb5f1
|
@ -1619,6 +1619,8 @@ dist_patch_DATA = \
|
||||||
%D%/packages/patches/openjdk-9-pointer-comparison.patch \
|
%D%/packages/patches/openjdk-9-pointer-comparison.patch \
|
||||||
%D%/packages/patches/openjdk-9-setsignalhandler.patch \
|
%D%/packages/patches/openjdk-9-setsignalhandler.patch \
|
||||||
%D%/packages/patches/openjdk-10-idlj-reproducibility.patch \
|
%D%/packages/patches/openjdk-10-idlj-reproducibility.patch \
|
||||||
|
%D%/packages/patches/openjdk-10-pointer-comparison.patch \
|
||||||
|
%D%/packages/patches/openjdk-10-setsignalhandler.patch \
|
||||||
%D%/packages/patches/openjdk-15-xcursor-no-dynamic.patch \
|
%D%/packages/patches/openjdk-15-xcursor-no-dynamic.patch \
|
||||||
%D%/packages/patches/openmpi-mtl-priorities.patch \
|
%D%/packages/patches/openmpi-mtl-priorities.patch \
|
||||||
%D%/packages/patches/openssh-hurd.patch \
|
%D%/packages/patches/openssh-hurd.patch \
|
||||||
|
|
|
@ -1058,7 +1058,9 @@ new Date();"))
|
||||||
(base32
|
(base32
|
||||||
"0i47ar8lxzjrkkiwbzybfxs473390h4jq9ahm3xqdvy5zpchxy3y"))
|
"0i47ar8lxzjrkkiwbzybfxs473390h4jq9ahm3xqdvy5zpchxy3y"))
|
||||||
(patches (search-patches
|
(patches (search-patches
|
||||||
"openjdk-10-idlj-reproducibility.patch"))))
|
"openjdk-10-idlj-reproducibility.patch"
|
||||||
|
"openjdk-10-pointer-comparison.patch"
|
||||||
|
"openjdk-10-setsignalhandler.patch"))))
|
||||||
(arguments
|
(arguments
|
||||||
(substitute-keyword-arguments (package-arguments openjdk9)
|
(substitute-keyword-arguments (package-arguments openjdk9)
|
||||||
((#:phases phases)
|
((#:phases phases)
|
||||||
|
|
|
@ -0,0 +1,14 @@
|
||||||
|
Patch inspired by file comparison with openjdk@19.
|
||||||
|
|
||||||
|
diff -u -r openjdk-10.alt/src/hotspot/os/linux/os_linux.cpp openjdk-10/src/hotspot/os/linux/os_linux.cpp
|
||||||
|
--- openjdk-10.alt/src/hotspot/os/linux/os_linux.cpp 2023-04-05 15:02:56.994779480 +0200
|
||||||
|
+++ openjdk-10/src/hotspot/os/linux/os_linux.cpp 2023-04-05 15:07:47.267537301 +0200
|
||||||
|
@@ -2155,7 +2155,7 @@
|
||||||
|
}
|
||||||
|
|
||||||
|
p = OSContainer::cpu_cpuset_memory_nodes();
|
||||||
|
- if (p < 0)
|
||||||
|
+ if (p == NULL)
|
||||||
|
st->print("cpu_memory_nodes() failed\n");
|
||||||
|
else {
|
||||||
|
st->print("cpu_memory_nodes: %s\n", p);
|
|
@ -0,0 +1,25 @@
|
||||||
|
Patch inspired by file comparison with openjdk@19.
|
||||||
|
|
||||||
|
diff -u -r openjdk-10.alt/test/hotspot/jtreg/runtime/StackGuardPages/exeinvoke.c openjdk-10/test/hotspot/jtreg/runtime/StackGuardPages/exeinvoke.c
|
||||||
|
--- openjdk-10.alt/test/hotspot/jtreg/runtime/StackGuardPages/exeinvoke.c 2023-04-05 15:03:00.070787628 +0200
|
||||||
|
+++ openjdk-10/test/hotspot/jtreg/runtime/StackGuardPages/exeinvoke.c 2023-04-05 15:29:51.379824348 +0200
|
||||||
|
@@ -67,8 +67,17 @@
|
||||||
|
longjmp(context, 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
-void set_signal_handler() {
|
||||||
|
- static char altstack[SIGSTKSZ];
|
||||||
|
+static char* altstack = NULL;
|
||||||
|
+
|
||||||
|
+ void set_signal_handler() {
|
||||||
|
+ if (altstack == NULL) {
|
||||||
|
+ // Dynamically allocated in case SIGSTKSZ is not constant
|
||||||
|
+ altstack = (char*)malloc(SIGSTKSZ);
|
||||||
|
+ if (altstack == NULL) {
|
||||||
|
+ fprintf(stderr, "Test ERROR. Unable to malloc altstack space\n");
|
||||||
|
+ exit(7);
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
|
||||||
|
stack_t ss = {
|
||||||
|
.ss_size = SIGSTKSZ,
|
Reference in New Issue