Re: [PR PATCH] [Updated] openjdk10-bootstrap: fix build with gcc 12 and glibc 2.36

[oreo639 <oreo639@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1393 bytes --]

There is an updated pull request by oreo639 against master on the void-packages repository

https://github.com/oreo639/void-packages openjdk10
https://github.com/void-linux/void-packages/pull/40003

openjdk10-bootstrap: fix build with gcc 12 and glibc 2.36
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

Revbump because the glibc fix requires a rebuild.

https://github.com/void-linux/void-packages/issues/39809

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/40003.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openjdk10-40003.patch --]
[-- Type: text/x-diff, Size: 3901 bytes --]

From c3866dcdd49358ee3bc30422a4a7e0f44f64d597 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 16 Oct 2022 21:54:47 -0700
Subject: [PATCH] openjdk10-bootstrap: fix build with gcc 12 and glibc 2.36

---
 .../patches/fix-path-exception-glibc.patch    | 31 +++++++++++++++++++
 .../fix-pointer-comparison-gcc12.patch        | 11 +++++++
 srcpkgs/openjdk10-bootstrap/template          |  2 +-
 3 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/openjdk10-bootstrap/patches/fix-path-exception-glibc.patch
 create mode 100644 srcpkgs/openjdk10-bootstrap/patches/fix-pointer-comparison-gcc12.patch

diff --git a/srcpkgs/openjdk10-bootstrap/patches/fix-path-exception-glibc.patch b/srcpkgs/openjdk10-bootstrap/patches/fix-path-exception-glibc.patch
new file mode 100644
index 000000000000..292f527318a1
--- /dev/null
+++ b/srcpkgs/openjdk10-bootstrap/patches/fix-path-exception-glibc.patch
@@ -0,0 +1,31 @@
+Fixes the following issue with glibc 2.36:
+
+Error occurred during initialization of boot layer
+java.lang.AssertionError: java.net.URISyntaxException: Illdk-k.internal.jvmstat/
+Caused by: java.net.URISyntaxException: Illegal character in path at index 32: file:///builddir/jdk11u-jdk-11-2er-release/jdk/modules/jdk.internal.jvmstat/
+make[3]: *** [ExplodedImageOptimize.gmk:41: /builddir/jdk11u-jdk-11-27/build/linux-x86_64-normal-server-release/jdk/_packages_attribute.done] Error 1
+make[2]: *** [make/Main.gmk:347: exploded-image-optimize] Error 2
+
+From 789b6089954d04a0222434916c93b1ed33c629c8 Mon Sep 17 00:00:00 2001
+From: Vladimir Kozlov <kvn@openjdk.org>
+Date: Mon, 20 Aug 2018 15:10:20 -0700
+Subject: [PATCH] 8209735: Disable avx512 by default
+
+Reviewed-by: iveresov, ecaspole
+---
+ src/hotspot/cpu/x86/globals_x86.hpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/hotspot/cpu/x86/globals_x86.hpp b/src/hotspot/cpu/x86/globals_x86.hpp
+index 423e1b1e478..49073f1834a 100644
+--- a/src/hotspot/cpu/x86/globals_x86.hpp
++++ b/src/hotspot/cpu/x86/globals_x86.hpp
+@@ -119,7 +119,7 @@ define_pd_global(bool, ThreadLocalHandshakes, false);
+   product(bool, UseStoreImmI16, true,                                       \
+           "Use store immediate 16-bits value instruction on x86")           \
+                                                                             \
+-  product(intx, UseAVX, 3,                                                  \
++  product(intx, UseAVX, 2,                                                  \
+           "Highest supported AVX instructions set on x86/x64")              \
+           range(0, 99)                                                      \
+                                                                             \
diff --git a/srcpkgs/openjdk10-bootstrap/patches/fix-pointer-comparison-gcc12.patch b/srcpkgs/openjdk10-bootstrap/patches/fix-pointer-comparison-gcc12.patch
new file mode 100644
index 000000000000..fd9ca2e8c3d9
--- /dev/null
+++ b/srcpkgs/openjdk10-bootstrap/patches/fix-pointer-comparison-gcc12.patch
@@ -0,0 +1,11 @@
+--- a/src/hotspot/os/linux/os_linux.cpp
++++ b/src/hotspot/os/linux/os_linux.cpp
+@@ -2155,7 +2155,7 @@ void os::Linux::print_container_info(out
+     }
+ 
+     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);
diff --git a/srcpkgs/openjdk10-bootstrap/template b/srcpkgs/openjdk10-bootstrap/template
index c61d33c697e8..f9cac7e371d7 100644
--- a/srcpkgs/openjdk10-bootstrap/template
+++ b/srcpkgs/openjdk10-bootstrap/template
@@ -2,7 +2,7 @@
 _final_jdk_home="usr/lib/jvm/java-10-openjdk"
 pkgname=openjdk10-bootstrap
 version=10.0.2p13
-revision=2
+revision=3
 _repo_ver=${version/p/+}
 archs="x86_64* i686* aarch64* arm* ppc64*"
 wrksrc="jdk10u-jdk-${_repo_ver}"