[packages/openjdk10] fix compilation failure with gcc >= 11

atler atler at pld-linux.org
Mon Jul 24 17:46:00 CEST 2023


commit fb841fd062804ce105870e69231c09ae4697b014
Author: Jan Palus <atler at pld-linux.org>
Date:   Mon Jul 24 16:35:33 2023 +0200

    fix compilation failure with gcc >= 11

 gcc11.patch    | 11 +++++++++++
 openjdk10.spec |  2 ++
 2 files changed, 13 insertions(+)
---
diff --git a/openjdk10.spec b/openjdk10.spec
index 40ffd72..7b0ea7e 100644
--- a/openjdk10.spec
+++ b/openjdk10.spec
@@ -37,6 +37,7 @@ Patch2:		x32.patch
 Patch3:		aarch64.patch
 Patch4:		build.patch
 Patch5:		glibc-2.34.patch
+Patch6:		gcc11.patch
 URL:		http://openjdk.java.net/
 BuildRequires:	/usr/bin/jar
 BuildRequires:	alsa-lib-devel
@@ -365,6 +366,7 @@ Przykłady dla OpenJDK.
 %endif
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build
 # Make sure we have /proc mounted - otherwise idlc will fail later.
diff --git a/gcc11.patch b/gcc11.patch
new file mode 100644
index 0000000..2f5e43f
--- /dev/null
+++ b/gcc11.patch
@@ -0,0 +1,11 @@
+--- jdk10u-jdk-10.0.2+13/src/hotspot/os/linux/os_linux.cpp.orig	2023-07-20 13:34:06.362027162 +0200
++++ jdk10u-jdk-10.0.2+13/src/hotspot/os/linux/os_linux.cpp	2023-07-20 13:45:38.059291965 +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);
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/openjdk10.git/commitdiff/336d6d831c9ef6f2dbdd22ed05031c5bf48b098e



More information about the pld-cvs-commit mailing list