From 0dfae7d43a9348b3fb0f355bb5af5d87e76db41a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 14 Feb 2022 18:03:59 +0100
Subject: [PATCH] mandrel: update to 21.3.1.0.

---
 srcpkgs/mandrel/files/musl.patch  |  9 ++++-----
 srcpkgs/mandrel/patches/mem.patch | 12 ------------
 srcpkgs/mandrel/template          | 12 ++++++------
 3 files changed, 10 insertions(+), 23 deletions(-)
 delete mode 100644 srcpkgs/mandrel/patches/mem.patch

diff --git a/srcpkgs/mandrel/files/musl.patch b/srcpkgs/mandrel/files/musl.patch
index 50e58332d03..61c51b7dfaa 100644
--- a/srcpkgs/mandrel/files/musl.patch
+++ b/srcpkgs/mandrel/files/musl.patch
@@ -7,13 +7,12 @@ Make musl a native libc.
      @Override
      public List<String> getAdditionalQueryCodeCompilerOptions() {
 -        /* Avoid the dependency to muslc for builds cross compiling to muslc. */
--        return Collections.singletonList("--static");
-+        return Collections.emptyList();
+         return Collections.singletonList("--static");
      }
  
      @Override
      public String getTargetCompiler() {
--        return "musl-gcc";
+-        return "x86_64-linux-musl-gcc";
 +        return "gcc";
      }
  
@@ -31,8 +30,8 @@ Make musl a native libc.
 -        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.");
+         if (JavaVersionUtil.JAVA_SPEC < 11) {
+             throw UserError.abort("Musl can only be used with labsjdk 11+.");
          }
 --- substratevm/src/com.oracle.svm.native.jvm.posix/src/JvmFuncs.c.orig
 +++ substratevm/src/com.oracle.svm.native.jvm.posix/src/JvmFuncs.c
diff --git a/srcpkgs/mandrel/patches/mem.patch b/srcpkgs/mandrel/patches/mem.patch
deleted file mode 100644
index 52b5578f49c..00000000000
--- a/srcpkgs/mandrel/patches/mem.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/mandrel-mandrel-21.1.0.0-Final/substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/NativeImage.java
-+++ b/mandrel-mandrel-21.1.0.0-Final/substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/NativeImage.java
-@@ -1829,6 +1829,9 @@
-         if (Long.compareUnsigned(memMax, SubstrateOptionsParser.parseLong(maxXmx)) >= 0) {
-             return maxXmx;
-         }
-+        if (memMax == 0) {
-+            return "2g";
-+        }
-         return Long.toUnsignedString(memMax);
-     }
- 
diff --git a/srcpkgs/mandrel/template b/srcpkgs/mandrel/template
index d5d41332a0d..6d25f3419b6 100644
--- a/srcpkgs/mandrel/template
+++ b/srcpkgs/mandrel/template
@@ -1,9 +1,9 @@
 # Template file for 'mandrel'
 pkgname=mandrel
-version=21.1.0.0
+version=21.3.1.0
 revision=1
 _java_ver=11
-_mx_ver=5.304.3
+_mx_ver=5.309.2
 archs="aarch64* x86_64*"  # upstream supported archs
 wrksrc="mandrel-${version}"
 create_wrksrc=yes
@@ -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="3f99ec20491cf79f8be19dfabb8fea6a82ea673bf450f2701f293db44fba4c95
- 670dd01e196d51aac0e5e3a4aa9b92e6b3953e16efbc7b7f6bb9dc39f3d1f9a7
- b5d15a3ed5c4ab1a3d84055a84375acac67a344c91a3c8076c429ecff8062e9d"
+checksum="a92bf8d88f6496c1455c9b355fff95fca2fddd2710a558dd2618fe9857bcad01
+ 7dec53ea2c36491896bc388bc60ca804abc5c26b0d4697d930a45cb5c9884469
+ fcb980a4980ff5f391fad050c493dc6cd045356a12912d833d3041fe54e62a56"
 shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so"
 nocross=yes
 
@@ -27,7 +27,7 @@ post_patch() {
 	if [ "$XBPS_TARGET_LIBC" = musl ]; then
 		# XXX: only static builds with native-image work
 		# (else TEXTREL issues)
-		patch -d mandrel-mandrel-* -p0 < ${FILESDIR}/musl.patch
+		patch --no-backup-if-mismatch -d mandrel-mandrel-* -p0 < ${FILESDIR}/musl.patch
 	fi
 }