From 6d42da57f5774050a5ce5dfa197418967cd2de4d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 15 Jun 2022 14:57:47 +0200
Subject: [PATCH] mandrel: update to 22.1.0.0.

---
 srcpkgs/mandrel/files/musl.patch | 31 +++++++++++--------------------
 srcpkgs/mandrel/template         | 14 +++++++-------
 2 files changed, 18 insertions(+), 27 deletions(-)

diff --git a/srcpkgs/mandrel/files/musl.patch b/srcpkgs/mandrel/files/musl.patch
index 61c51b7dfaa..dda08a9857c 100644
--- a/srcpkgs/mandrel/files/musl.patch
+++ b/srcpkgs/mandrel/files/musl.patch
@@ -2,37 +2,28 @@ Make musl a native libc.
 
 --- substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/linux/libc/MuslLibC.java.orig
 +++ substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/linux/libc/MuslLibC.java
-@@ -43,13 +43,12 @@
- 
+@@ -41,5 +41,4 @@
      @Override
      public List<String> getAdditionalQueryCodeCompilerOptions() {
 -        /* Avoid the dependency to muslc for builds cross compiling to muslc. */
-         return Collections.singletonList("--static");
+-        return Collections.singletonList("--static");
++        return Collections.emptyList();
      }
- 
-     @Override
-     public String getTargetCompiler() {
--        return "x86_64-linux-musl-gcc";
-+        return "gcc";
-     }
- 
-     @Override
-@@ -59,14 +58,11 @@
+@@ -58,13 +52,6 @@
  
      @Override
      public boolean requiresLibCSpecificStaticJDKLibraries() {
 -        return true;
-+        return false;
-     }
- 
-     @Override
-     public void checkIfLibCSupported() {
+-    }
+-
+-    @Override
+-    public void checkIfLibCSupported() {
 -        if (!SubstrateOptions.StaticExecutable.getValue()) {
 -            throw UserError.abort("Musl can only be used for statically linked executables.");
 -        }
-         if (JavaVersionUtil.JAVA_SPEC < 11) {
-             throw UserError.abort("Musl can only be used with labsjdk 11+.");
-         }
++        return false;
+     }
+ }
 --- substratevm/src/com.oracle.svm.native.jvm.posix/src/JvmFuncs.c.orig
 +++ substratevm/src/com.oracle.svm.native.jvm.posix/src/JvmFuncs.c
 @@ -128,7 +128,7 @@
diff --git a/srcpkgs/mandrel/template b/srcpkgs/mandrel/template
index 6d25f3419b6..eff336161cf 100644
--- a/srcpkgs/mandrel/template
+++ b/srcpkgs/mandrel/template
@@ -1,14 +1,14 @@
 # Template file for 'mandrel'
 pkgname=mandrel
-version=21.3.1.0
+version=22.1.0.0
 revision=1
 _java_ver=11
-_mx_ver=5.309.2
+_mx_ver=6.1.2
 archs="aarch64* x86_64*"  # upstream supported archs
 wrksrc="mandrel-${version}"
 create_wrksrc=yes
-hostmakedepends="openjdk${_java_ver} openjdk${_java_ver}-src
- openjdk${_java_ver}-static-libs python3"
+hostmakedepends="openjdk${_java_ver} openjdk${_java_ver}-jmods
+ openjdk${_java_ver}-src openjdk${_java_ver}-static-libs python3"
 makedepends="zlib-devel"
 short_desc="Downstream distribution of the GraalVM community edition"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -17,9 +17,9 @@ homepage="https://github.com/graalvm/mandrel"
 distfiles="https://github.com/graalvm/mandrel-packaging/archive/refs/tags/mandrel-${version}-Final.tar.gz>packaging-${version}.tar.gz
  https://github.com/graalvm/mandrel/archive/refs/tags/mandrel-${version}-Final.tar.gz
  https://github.com/graalvm/mx/archive/refs/tags/${_mx_ver}.tar.gz"
-checksum="a92bf8d88f6496c1455c9b355fff95fca2fddd2710a558dd2618fe9857bcad01
- 7dec53ea2c36491896bc388bc60ca804abc5c26b0d4697d930a45cb5c9884469
- fcb980a4980ff5f391fad050c493dc6cd045356a12912d833d3041fe54e62a56"
+checksum="a93ef67c75c52ff90faba95236100c4f702df2de87593b9bb00da3a2cbec3a23
+ 8cf3aefe5f9aa7869ddaf02376be5febc20831461ce524c912f3f22fbf922863
+ ae7a7d2a195666e32126f51dad5b55abbc204a13e89582172cc461a29ae84205"
 shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so"
 nocross=yes