[PR PATCH] openjdk11: fix armv7l-musl build.

[PR PATCH] openjdk11: fix armv7l-musl build.

[mhmdanas]

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

There is a new pull request by mhmdanas against master on the void-packages repository

https://github.com/mhmdanas/void-packages openjdk11-fix-armv7l-musl-build
https://github.com/void-linux/void-packages/pull/45195

openjdk11: fix armv7l-musl build.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **NO** (just tested build)

<!--
#### 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/45195.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openjdk11-fix-armv7l-musl-build-45195.patch --]
[-- Type: text/x-diff, Size: 2899 bytes --]

From 1f8a5931263ba1c8e9d0d3445ac24d86fa3667e1 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Sat, 22 Jul 2023 14:55:38 +0100
Subject: [PATCH] openjdk11: fix armv7l-musl build.

---
 .../openjdk11/files/musl_patches/arm.patch    | 30 +++++++++++++++++++
 .../openjdk11/patches/fix-musl-detection.diff | 20 +++++++++++++
 srcpkgs/openjdk11/template                    |  1 +
 3 files changed, 51 insertions(+)
 create mode 100644 srcpkgs/openjdk11/files/musl_patches/arm.patch
 create mode 100644 srcpkgs/openjdk11/patches/fix-musl-detection.diff

diff --git a/srcpkgs/openjdk11/files/musl_patches/arm.patch b/srcpkgs/openjdk11/files/musl_patches/arm.patch
new file mode 100644
index 0000000000000..12d0022c14917
--- /dev/null
+++ b/srcpkgs/openjdk11/files/musl_patches/arm.patch
@@ -0,0 +1,30 @@
+Patches for musl taken from Alpine linux: https://git.alpinelinux.org/aports/commit/?id=8a1ae17d4a9af54285c7891a680620e7e24c6280
+--- old/src/hotspot/os_cpu/linux_arm/os_linux_arm.cpp
++++ new/src/hotspot/os_cpu/linux_arm/os_linux_arm.cpp
+@@ -71,7 +71,6 @@
+ # include <pwd.h>
+ # include <poll.h>
+ # include <ucontext.h>
+-# include <fpu_control.h>
+ # include <asm/ptrace.h>
+
+ #define SPELL_REG_SP  "sp"
+@@ -104,6 +103,18 @@
+ #define ARM_REGS_IN_CONTEXT  31
+
+ #else
++
++// Stupid hack as the origin if below doesnt compile with gcc 8.2.0:
++//
++// os_linux_arm.cpp:114:5: error: missing binary operator before token "("
++//  #if NGREG == 16
++//       ^~~~~
++//
++// The NGREG is 18, so force it to that value.
++#ifdef NGREG
++#  undef NGREG
++#endif
++#define NGREG 18
+
+ #if NGREG == 16
+ // These definitions are based on the observation that until
diff --git a/srcpkgs/openjdk11/patches/fix-musl-detection.diff b/srcpkgs/openjdk11/patches/fix-musl-detection.diff
new file mode 100644
index 0000000000000..8f38c823c3a94
--- /dev/null
+++ b/srcpkgs/openjdk11/patches/fix-musl-detection.diff
@@ -0,0 +1,20 @@
+--- a/make/autoconf/platform.m4	2023-07-22 14:48:46.291451605 +0100
++++ b/make/autoconf/platform.m4	2023-07-05 08:22:24.000000000 +0100
+@@ -214,7 +214,7 @@
+ AC_DEFUN([PLATFORM_EXTRACT_VARS_FROM_LIBC],
+ [
+   case "$1" in
+-    *linux*-musl*)
++    *linux*-musl)
+       VAR_LIBC=musl
+       ;;
+     *linux*-gnu)
+@@ -232,7 +232,7 @@
+ AC_DEFUN([PLATFORM_EXTRACT_VARS_FROM_ABI],
+ [
+   case "$1" in
+-    *linux*-musl*)
++    *linux*-musl)
+       VAR_ABI=musl
+       ;;
+     *linux*-gnu)
diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index aed39c3b41e26..b5dd94241a0c8 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -9,6 +9,7 @@ build_style=gnu-configure
 configure_args="
  --disable-warnings-as-errors
  --prefix=${XBPS_DESTDIR}/${XBPS_CROSS_TRIPLET}/${pkgname}-${version}/usr/lib
+ --with-jobs=${XBPS_ORIG_MAKEJOBS}
  --enable-unlimited-crypto
  --with-zlib=system
  --with-libjpeg=system

Re: [PR PATCH] [Updated] openjdk11: fix armv7l-musl build.

[mhmdanas]

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

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

https://github.com/mhmdanas/void-packages openjdk11-fix-armv7l-musl-build
https://github.com/void-linux/void-packages/pull/45195

openjdk11: fix armv7l-musl build.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **NO** (just tested build)

<!--
#### 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/45195.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openjdk11-fix-armv7l-musl-build-45195.patch --]
[-- Type: text/x-diff, Size: 2899 bytes --]

From 4852924d87e1d9940dfa2f88decc720ade044121 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Sat, 22 Jul 2023 14:55:38 +0100
Subject: [PATCH] openjdk11: fix armv7l-musl build.

---
 .../openjdk11/files/musl_patches/arm.patch    | 30 +++++++++++++++++++
 .../openjdk11/patches/fix-musl-detection.diff | 20 +++++++++++++
 srcpkgs/openjdk11/template                    |  1 +
 3 files changed, 51 insertions(+)
 create mode 100644 srcpkgs/openjdk11/files/musl_patches/arm.patch
 create mode 100644 srcpkgs/openjdk11/patches/fix-musl-detection.diff

diff --git a/srcpkgs/openjdk11/files/musl_patches/arm.patch b/srcpkgs/openjdk11/files/musl_patches/arm.patch
new file mode 100644
index 0000000000000..12d0022c14917
--- /dev/null
+++ b/srcpkgs/openjdk11/files/musl_patches/arm.patch
@@ -0,0 +1,30 @@
+Patches for musl taken from Alpine linux: https://git.alpinelinux.org/aports/commit/?id=8a1ae17d4a9af54285c7891a680620e7e24c6280
+--- old/src/hotspot/os_cpu/linux_arm/os_linux_arm.cpp
++++ new/src/hotspot/os_cpu/linux_arm/os_linux_arm.cpp
+@@ -71,7 +71,6 @@
+ # include <pwd.h>
+ # include <poll.h>
+ # include <ucontext.h>
+-# include <fpu_control.h>
+ # include <asm/ptrace.h>
+
+ #define SPELL_REG_SP  "sp"
+@@ -104,6 +103,18 @@
+ #define ARM_REGS_IN_CONTEXT  31
+
+ #else
++
++// Stupid hack as the origin if below doesnt compile with gcc 8.2.0:
++//
++// os_linux_arm.cpp:114:5: error: missing binary operator before token "("
++//  #if NGREG == 16
++//       ^~~~~
++//
++// The NGREG is 18, so force it to that value.
++#ifdef NGREG
++#  undef NGREG
++#endif
++#define NGREG 18
+
+ #if NGREG == 16
+ // These definitions are based on the observation that until
diff --git a/srcpkgs/openjdk11/patches/fix-musl-detection.diff b/srcpkgs/openjdk11/patches/fix-musl-detection.diff
new file mode 100644
index 0000000000000..d6c0c3b201408
--- /dev/null
+++ b/srcpkgs/openjdk11/patches/fix-musl-detection.diff
@@ -0,0 +1,20 @@
+--- a/make/autoconf/platform.m4	2023-07-05 08:22:24.000000000 +0100
++++ b/make/autoconf/platform.m4	2023-07-22 14:48:46.291451605 +0100
+@@ -214,7 +214,7 @@
+ AC_DEFUN([PLATFORM_EXTRACT_VARS_FROM_LIBC],
+ [
+   case "$1" in
+-    *linux*-musl)
++    *linux*-musl*)
+       VAR_LIBC=musl
+       ;;
+     *linux*-gnu)
+@@ -232,7 +232,7 @@
+ AC_DEFUN([PLATFORM_EXTRACT_VARS_FROM_ABI],
+ [
+   case "$1" in
+-    *linux*-musl)
++    *linux*-musl*)
+       VAR_ABI=musl
+       ;;
+     *linux*-gnu)
diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index aed39c3b41e26..b5dd94241a0c8 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -9,6 +9,7 @@ build_style=gnu-configure
 configure_args="
  --disable-warnings-as-errors
  --prefix=${XBPS_DESTDIR}/${XBPS_CROSS_TRIPLET}/${pkgname}-${version}/usr/lib
+ --with-jobs=${XBPS_ORIG_MAKEJOBS}
  --enable-unlimited-crypto
  --with-zlib=system
  --with-libjpeg=system

Re: [PR PATCH] [Merged]: openjdk11: fix armv7l-musl build.

[classabbyamp]

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

There's a merged pull request on the void-packages repository

openjdk11: fix armv7l-musl build.
https://github.com/void-linux/void-packages/pull/45195

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **NO** (just tested build)

<!--
#### 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
-->