mirror of
https://github.com/void-linux/void-packages.git
synced 2025-06-05 06:33:50 +02:00
openjdk11: fix armv7l-musl build.
This commit is contained in:
parent
f7a3174f7d
commit
92d498c5fd
3 changed files with 51 additions and 0 deletions
30
srcpkgs/openjdk11/files/musl_patches/arm.patch
Normal file
30
srcpkgs/openjdk11/files/musl_patches/arm.patch
Normal file
|
@ -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
|
20
srcpkgs/openjdk11/patches/fix-musl-detection.diff
Normal file
20
srcpkgs/openjdk11/patches/fix-musl-detection.diff
Normal file
|
@ -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)
|
|
@ -9,6 +9,7 @@ build_style=gnu-configure
|
||||||
configure_args="
|
configure_args="
|
||||||
--disable-warnings-as-errors
|
--disable-warnings-as-errors
|
||||||
--prefix=${XBPS_DESTDIR}/${XBPS_CROSS_TRIPLET}/${pkgname}-${version}/usr/lib
|
--prefix=${XBPS_DESTDIR}/${XBPS_CROSS_TRIPLET}/${pkgname}-${version}/usr/lib
|
||||||
|
--with-jobs=${XBPS_ORIG_MAKEJOBS}
|
||||||
--enable-unlimited-crypto
|
--enable-unlimited-crypto
|
||||||
--with-zlib=system
|
--with-zlib=system
|
||||||
--with-libjpeg=system
|
--with-libjpeg=system
|
||||||
|
|
Loading…
Add table
Reference in a new issue