[PR PATCH] mandrel: update to 23.0.0.0.

[PR PATCH] mandrel: update to 23.0.0.0.

[icp1994]

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

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

https://github.com/icp1994/void-packages mandrel
https://github.com/void-linux/void-packages/pull/45056

mandrel: update to 23.0.0.0.
#### Testing the changes
- I tested the changes in this PR: **briefly** (built `jet`, included in PR)

#### Local build testing
- I built this PR locally for my native architecture: **x86_64**

cc @leahneukirchen 

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

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

From 969ff3eeca9fba7486ac122fdf856e9d114c890c Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sat, 15 Jul 2023 22:35:02 +0530
Subject: [PATCH 1/2] jet: update to 0.6.26.

---
 srcpkgs/jet/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/jet/template b/srcpkgs/jet/template
index 0a58b1559fbb..5c1f5f9b3046 100644
--- a/srcpkgs/jet/template
+++ b/srcpkgs/jet/template
@@ -1,6 +1,6 @@
 # Template file for 'jet'
 pkgname=jet
-version=0.5.25
+version=0.6.26
 revision=1
 hostmakedepends="mandrel leiningen"
 makedepends="zlib-devel"
@@ -10,7 +10,7 @@ license="EPL-1.0"
 homepage="https://github.com/borkdude/jet"
 changelog="https://raw.githubusercontent.com/borkdude/jet/master/CHANGELOG.md"
 distfiles="https://github.com/borkdude/jet/archive/refs/tags/v${version}.tar.gz"
-checksum=9054dfd4406c4fb034c68eddda0996ca238345bd97695e579a7c0fdeeb639ab0
+checksum=671f6f1b14f9d2f2a3d698027edbf06036e367b2d0347ad6edf2fc81b39e0b6b
 nocross="mandrel"
 
 do_build() {

From 680514a6114c14bf203920a95a20deabcd35dfa8 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sat, 15 Jul 2023 22:45:28 +0530
Subject: [PATCH 2/2] mandrel: update to 23.0.0.0.

---
 srcpkgs/mandrel/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/mandrel/template b/srcpkgs/mandrel/template
index d75ca825cef1..2f06d2eb4711 100644
--- a/srcpkgs/mandrel/template
+++ b/srcpkgs/mandrel/template
@@ -1,9 +1,9 @@
 # Template file for 'mandrel'
 pkgname=mandrel
-version=22.3.2.1
+version=23.0.0.0
 revision=1
 _java_ver=17
-_mx_ver=6.20.3
+_mx_ver=6.26.5
 archs="aarch64* x86_64*"  # upstream supported archs
 hostmakedepends="openjdk${_java_ver} openjdk${_java_ver}-jmods
  openjdk${_java_ver}-src openjdk${_java_ver}-static-libs python3"
@@ -15,9 +15,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="b109a1204ace963ec94523d1c2b5bffd2fa68aef8a79e2d650629324e911a890
- 4aab85f02bed302b763c036c1a3f392d974b0b4d4ddf22e297c3246744e16455
- b2d86d0169a790afdb7ec83e47ffd46ef8bdad5c37f6a635423624a4ee0c9c54"
+checksum="3eb9bf128f4a64a8efd19e100dd84e55cb3ae5eb4c3fcad8a074ddc1d5ed3ffb
+ ee88ef38950bd7a89aef18f6d4f9e6f56a4948ec0e9608a434a96311721af85b
+ 9e8f619b5001304d36ee1c3fd964e081977dc9f883c8028873390f9231374693"
 shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so"
 nocross=yes
 

Re: [PR PATCH] [Updated] mandrel: update to 23.0.0.0.

[icp1994]

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

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

https://github.com/icp1994/void-packages mandrel
https://github.com/void-linux/void-packages/pull/45056

mandrel: update to 23.0.0.0.
#### Testing the changes
- I tested the changes in this PR: **briefly** (built `jet`, included in PR)

#### Local build testing
- I built this PR locally for my native architecture: **x86_64**

cc @leahneukirchen 

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

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

From 969ff3eeca9fba7486ac122fdf856e9d114c890c Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sat, 15 Jul 2023 22:35:02 +0530
Subject: [PATCH 1/2] jet: update to 0.6.26.

---
 srcpkgs/jet/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/jet/template b/srcpkgs/jet/template
index 0a58b1559fbb..5c1f5f9b3046 100644
--- a/srcpkgs/jet/template
+++ b/srcpkgs/jet/template
@@ -1,6 +1,6 @@
 # Template file for 'jet'
 pkgname=jet
-version=0.5.25
+version=0.6.26
 revision=1
 hostmakedepends="mandrel leiningen"
 makedepends="zlib-devel"
@@ -10,7 +10,7 @@ license="EPL-1.0"
 homepage="https://github.com/borkdude/jet"
 changelog="https://raw.githubusercontent.com/borkdude/jet/master/CHANGELOG.md"
 distfiles="https://github.com/borkdude/jet/archive/refs/tags/v${version}.tar.gz"
-checksum=9054dfd4406c4fb034c68eddda0996ca238345bd97695e579a7c0fdeeb639ab0
+checksum=671f6f1b14f9d2f2a3d698027edbf06036e367b2d0347ad6edf2fc81b39e0b6b
 nocross="mandrel"
 
 do_build() {

From 58071f87981664d7468a1dbbaad1376a47fceed6 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sat, 15 Jul 2023 22:45:28 +0530
Subject: [PATCH 2/2] mandrel: update to 23.0.0.0.

---
 srcpkgs/mandrel/files/musl.patch | 48 --------------------------------
 srcpkgs/mandrel/template         | 18 ++++--------
 2 files changed, 5 insertions(+), 61 deletions(-)
 delete mode 100644 srcpkgs/mandrel/files/musl.patch

diff --git a/srcpkgs/mandrel/files/musl.patch b/srcpkgs/mandrel/files/musl.patch
deleted file mode 100644
index dda08a9857ce..000000000000
--- a/srcpkgs/mandrel/files/musl.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-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
-@@ -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.emptyList();
-     }
-@@ -58,13 +52,6 @@
- 
-     @Override
-     public boolean requiresLibCSpecificStaticJDKLibraries() {
--        return true;
--    }
--
--    @Override
--    public void checkIfLibCSupported() {
--        if (!SubstrateOptions.StaticExecutable.getValue()) {
--            throw UserError.abort("Musl can only be used for statically linked executables.");
--        }
-+        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 @@
-     return listen(fd, count);
- }
- 
--JNIEXPORT int JNICALL JVM_Send(int fd, char* buf, size_t nBytes, uint flags) {
-+JNIEXPORT int JNICALL JVM_Send(int fd, char* buf, size_t nBytes, unsigned int flags) {
-     RESTARTABLE_RETURN_INT(send(fd, buf, nBytes, flags));
- }
- 
---- substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/linux/libc/LibCFeature.java.orig
-+++ substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/linux/libc/LibCFeature.java
-@@ -55,7 +55,7 @@
-             @Override
-             public String getValueOrDefault(UnmodifiableEconomicMap<OptionKey<?>, Object> values) {
-                 if (!values.containsKey(this)) {
--                    return Platform.includedIn(Platform.ANDROID.class) ? "bionic" : "glibc";
-+                    return Platform.includedIn(Platform.ANDROID.class) ? "bionic" : "musl";
-                 }
-                 return (String) values.get(this);
-             }
diff --git a/srcpkgs/mandrel/template b/srcpkgs/mandrel/template
index d75ca825cef1..3cffc6c0ec2c 100644
--- a/srcpkgs/mandrel/template
+++ b/srcpkgs/mandrel/template
@@ -1,9 +1,9 @@
 # Template file for 'mandrel'
 pkgname=mandrel
-version=22.3.2.1
+version=23.0.0.0
 revision=1
 _java_ver=17
-_mx_ver=6.20.3
+_mx_ver=6.26.5
 archs="aarch64* x86_64*"  # upstream supported archs
 hostmakedepends="openjdk${_java_ver} openjdk${_java_ver}-jmods
  openjdk${_java_ver}-src openjdk${_java_ver}-static-libs python3"
@@ -15,20 +15,12 @@ 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="b109a1204ace963ec94523d1c2b5bffd2fa68aef8a79e2d650629324e911a890
- 4aab85f02bed302b763c036c1a3f392d974b0b4d4ddf22e297c3246744e16455
- b2d86d0169a790afdb7ec83e47ffd46ef8bdad5c37f6a635423624a4ee0c9c54"
+checksum="3eb9bf128f4a64a8efd19e100dd84e55cb3ae5eb4c3fcad8a074ddc1d5ed3ffb
+ ee88ef38950bd7a89aef18f6d4f9e6f56a4948ec0e9608a434a96311721af85b
+ 9e8f619b5001304d36ee1c3fd964e081977dc9f883c8028873390f9231374693"
 shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so"
 nocross=yes
 
-post_patch() {
-	if [ "$XBPS_TARGET_LIBC" = musl ]; then
-		# XXX: only static builds with native-image work
-		# (else TEXTREL issues)
-		patch --no-backup-if-mismatch -d mandrel-mandrel-* -p0 < ${FILESDIR}/musl.patch
-	fi
-}
-
 do_build() {
 	cd mandrel-packaging-*
 	export PATH=/usr/libexec/chroot-git:$PATH

Re: mandrel: update to 23.0.0.0.

[icp1994]

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

New comment by icp1994 on void-packages repository

https://github.com/void-linux/void-packages/pull/45056#issuecomment-1636881719

Comment:
I'm not sure the patch is necessary. The source file it patched was completely removed with it's parent dir. Found some similar code at `substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/libc/HostedMuslLibC.java`

Re: mandrel: update to 23.0.0.0.

[leahneukirchen]

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

New comment by leahneukirchen on void-packages repository

https://github.com/void-linux/void-packages/pull/45056#issuecomment-1636882336

Comment:
The patch is needed if it links musl statically else (easy to verify).

Please also rebuild Babashka.

Re: [PR PATCH] [Updated] mandrel: update to 23.0.0.0.

[icp1994]

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

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

https://github.com/icp1994/void-packages mandrel
https://github.com/void-linux/void-packages/pull/45056

mandrel: update to 23.0.0.0.
#### Testing the changes
- I tested the changes in this PR: **briefly** (built `jet`, included in PR)

#### Local build testing
- I built this PR locally for my native architecture: **x86_64**

cc @leahneukirchen 

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

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

From 969ff3eeca9fba7486ac122fdf856e9d114c890c Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sat, 15 Jul 2023 22:35:02 +0530
Subject: [PATCH 1/3] jet: update to 0.6.26.

---
 srcpkgs/jet/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/jet/template b/srcpkgs/jet/template
index 0a58b1559fbb..5c1f5f9b3046 100644
--- a/srcpkgs/jet/template
+++ b/srcpkgs/jet/template
@@ -1,6 +1,6 @@
 # Template file for 'jet'
 pkgname=jet
-version=0.5.25
+version=0.6.26
 revision=1
 hostmakedepends="mandrel leiningen"
 makedepends="zlib-devel"
@@ -10,7 +10,7 @@ license="EPL-1.0"
 homepage="https://github.com/borkdude/jet"
 changelog="https://raw.githubusercontent.com/borkdude/jet/master/CHANGELOG.md"
 distfiles="https://github.com/borkdude/jet/archive/refs/tags/v${version}.tar.gz"
-checksum=9054dfd4406c4fb034c68eddda0996ca238345bd97695e579a7c0fdeeb639ab0
+checksum=671f6f1b14f9d2f2a3d698027edbf06036e367b2d0347ad6edf2fc81b39e0b6b
 nocross="mandrel"
 
 do_build() {

From 58071f87981664d7468a1dbbaad1376a47fceed6 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sat, 15 Jul 2023 22:45:28 +0530
Subject: [PATCH 2/3] mandrel: update to 23.0.0.0.

---
 srcpkgs/mandrel/files/musl.patch | 48 --------------------------------
 srcpkgs/mandrel/template         | 18 ++++--------
 2 files changed, 5 insertions(+), 61 deletions(-)
 delete mode 100644 srcpkgs/mandrel/files/musl.patch

diff --git a/srcpkgs/mandrel/files/musl.patch b/srcpkgs/mandrel/files/musl.patch
deleted file mode 100644
index dda08a9857ce..000000000000
--- a/srcpkgs/mandrel/files/musl.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-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
-@@ -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.emptyList();
-     }
-@@ -58,13 +52,6 @@
- 
-     @Override
-     public boolean requiresLibCSpecificStaticJDKLibraries() {
--        return true;
--    }
--
--    @Override
--    public void checkIfLibCSupported() {
--        if (!SubstrateOptions.StaticExecutable.getValue()) {
--            throw UserError.abort("Musl can only be used for statically linked executables.");
--        }
-+        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 @@
-     return listen(fd, count);
- }
- 
--JNIEXPORT int JNICALL JVM_Send(int fd, char* buf, size_t nBytes, uint flags) {
-+JNIEXPORT int JNICALL JVM_Send(int fd, char* buf, size_t nBytes, unsigned int flags) {
-     RESTARTABLE_RETURN_INT(send(fd, buf, nBytes, flags));
- }
- 
---- substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/linux/libc/LibCFeature.java.orig
-+++ substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/linux/libc/LibCFeature.java
-@@ -55,7 +55,7 @@
-             @Override
-             public String getValueOrDefault(UnmodifiableEconomicMap<OptionKey<?>, Object> values) {
-                 if (!values.containsKey(this)) {
--                    return Platform.includedIn(Platform.ANDROID.class) ? "bionic" : "glibc";
-+                    return Platform.includedIn(Platform.ANDROID.class) ? "bionic" : "musl";
-                 }
-                 return (String) values.get(this);
-             }
diff --git a/srcpkgs/mandrel/template b/srcpkgs/mandrel/template
index d75ca825cef1..3cffc6c0ec2c 100644
--- a/srcpkgs/mandrel/template
+++ b/srcpkgs/mandrel/template
@@ -1,9 +1,9 @@
 # Template file for 'mandrel'
 pkgname=mandrel
-version=22.3.2.1
+version=23.0.0.0
 revision=1
 _java_ver=17
-_mx_ver=6.20.3
+_mx_ver=6.26.5
 archs="aarch64* x86_64*"  # upstream supported archs
 hostmakedepends="openjdk${_java_ver} openjdk${_java_ver}-jmods
  openjdk${_java_ver}-src openjdk${_java_ver}-static-libs python3"
@@ -15,20 +15,12 @@ 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="b109a1204ace963ec94523d1c2b5bffd2fa68aef8a79e2d650629324e911a890
- 4aab85f02bed302b763c036c1a3f392d974b0b4d4ddf22e297c3246744e16455
- b2d86d0169a790afdb7ec83e47ffd46ef8bdad5c37f6a635423624a4ee0c9c54"
+checksum="3eb9bf128f4a64a8efd19e100dd84e55cb3ae5eb4c3fcad8a074ddc1d5ed3ffb
+ ee88ef38950bd7a89aef18f6d4f9e6f56a4948ec0e9608a434a96311721af85b
+ 9e8f619b5001304d36ee1c3fd964e081977dc9f883c8028873390f9231374693"
 shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so"
 nocross=yes
 
-post_patch() {
-	if [ "$XBPS_TARGET_LIBC" = musl ]; then
-		# XXX: only static builds with native-image work
-		# (else TEXTREL issues)
-		patch --no-backup-if-mismatch -d mandrel-mandrel-* -p0 < ${FILESDIR}/musl.patch
-	fi
-}
-
 do_build() {
 	cd mandrel-packaging-*
 	export PATH=/usr/libexec/chroot-git:$PATH

From c54c1a95dbd0202786c9a8afca7e06570d0e47b9 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sun, 16 Jul 2023 16:10:23 +0530
Subject: [PATCH 3/3] babashka: update to 1.3.181.

---
 srcpkgs/babashka/template | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/babashka/template b/srcpkgs/babashka/template
index 30514d66c304..2a51e5525ad1 100644
--- a/srcpkgs/babashka/template
+++ b/srcpkgs/babashka/template
@@ -1,6 +1,6 @@
 # Template file for 'babashka'
 pkgname=babashka
-version=1.3.179
+version=1.3.181
 revision=1
 create_wrksrc=yes
 hostmakedepends="mandrel leiningen git"
@@ -11,14 +11,14 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="EPL-1.0"
 homepage="https://babashka.org/"
 changelog="https://github.com/babashka/babashka/raw/master/CHANGELOG.md"
-_sci_commit=e80d94a9cbf13127628ceddf531e1eed4e9f15de
+_sci_commit=348f6839495fe71f8f3b49680f12e95577d822a5
 _babashka_curl_commit=e936acd40544eb637b6041c7e89454b21eb7ee34
 _babashka_nrepl_commit=605788cd42dc35dc03a0276c9e9e5cc4e78e9a0b
 _depstar_commit=c419b8c82041855d55593c5b561fc7cea8234712
-_process_commit=dadcff417675c84dcd32448e22e6270d1555af5d
-_pods_commit=64ecb94de888a34aeb023eb7f50bfa1a34943f24
-_deps_clj_commit=2f93fe8ba712c855feb6ecf26d2ed70646b34356
-_fs_commit=ceb8f7f48d4a1438a434ffc16238d5f1883bb4ac
+_process_commit=0258a70aba8dc3dacc84dd9e01ae8e3f8c3672c0
+_pods_commit=6ad6045b94bc871c5107bfc75d39643b6c1bc8ba
+_deps_clj_commit=82adf0cb15249a753851579bc9fac0db52921778
+_fs_commit=c5c5365585efa44a6c4e8ca91bd84d9adc631a02
 _babashka_core_commit=52a6037bd4b632bffffb04394fb4efd0cdab6b1e
 distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.tar.gz
  https://github.com/borkdude/sci/archive/${_sci_commit}.tar.gz
@@ -30,15 +30,15 @@ distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.ta
  https://github.com/borkdude/deps.clj/archive/${_deps_clj_commit}.tar.gz
  https://github.com/babashka/fs/archive/${_fs_commit}.tar.gz
  https://github.com/babashka/babashka.core/archive/${_babashka_core_commit}.tar.gz"
-checksum="7c6b2dada8ce8107107dc776720ac7323fed3d3bec83dba7879432b9b61e6c18
- f9be60cfaef7f85696fa0a67108ecfdd21fdc977960b38b281e0cc93d9dd9da1
+checksum="bb20e76fa8d095a7827d8e80ff0ad741297a4afe597c99b1e7e7132b322bbe25
+ 39cf1e9e4d640d451917d683d42f8464f70b7f75b760d8c426f7af9f8f1bc11d
  6e60865ae2d4522c3de55b3b1daed51b42bb9bb6095b1d2fbd3620facece3257
  e76d1ce7a6905c6f588f1c55bec6797896459bca9c13a538d6fab9aa13603642
  9d214a10a4f5e4f15b9c80354dae85689a40e941ec3417203354c0dc3ce9457b
- 003d3d005d40f620df519b26808b3753500bc94eba333be904603a2c2e05db57
- b9ca2bd69aa510db91526e73523f3c2aeb14033fd8055346d51d7c5143262972
- f67dc9f220385b0048640e46a9952749cf5a55e457ecc9f6f5601d4ab23a3b85
- 8693d3d4cad5a6a198dbbcec2edc93d977711b1428235ff92e3c031495af0366
+ f443ca02859c2c44229f8a6d5d8be7b6a92fa1c9efa6af9edeab8e3947bff6f5
+ c858a68cb17cd173a8a39c3a76d72f7e134bc6dec0bdc111552842974762c335
+ 85de8d9f3a5992f5eb5a1551f8c1cfc0b5864dc57c0ba3425c3a98f1f5c6e544
+ 12b7a137a32d6cda68c401dd8679a475328559b26a080a6553e9a34e2a857eea
  bad285812bcc7de7e0dd905c5df99045d7f92d6e2e191fc2768c06adbaaeb709"
 
 # https://github.com/openjdk/jdk17u-dev/pull/783

Re: mandrel: update to 23.0.0.0.

[icp1994]

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

New comment by icp1994 on void-packages repository

https://github.com/void-linux/void-packages/pull/45056#issuecomment-1637053588

Comment:
> The patch is needed if it links musl statically else (easy to verify).

Does that require a musl system to verify?

Re: mandrel: update to 23.0.0.0.

[leahneukirchen]

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

New comment by leahneukirchen on void-packages repository

https://github.com/void-linux/void-packages/pull/45056#issuecomment-1656633832

Comment:
```
2023-07-16T11:06:37.4448375Z => babashka-1.3.181_1: running post-install hook: 06-strip-and-debug-pkgs ...
2023-07-16T11:06:37.8129728Z    Stripped static executable: /usr/bin/bb
```

We want this dynamically linked.

Re: [PR PATCH] [Updated] mandrel: update to 23.0.0.0.

[icp1994]

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

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

https://github.com/icp1994/void-packages mandrel
https://github.com/void-linux/void-packages/pull/45056

mandrel: update to 23.0.0.0.
#### Testing the changes
- I tested the changes in this PR: **briefly** (built `jet`, included in PR)

#### Local build testing
- I built this PR locally for my native architecture: **x86_64**

cc @leahneukirchen 

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

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

From bff3dab133cde01400d0f2d45ddf95d2187d392d Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sat, 15 Jul 2023 22:35:02 +0530
Subject: [PATCH 1/3] jet: update to 0.6.26.

---
 srcpkgs/jet/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/jet/template b/srcpkgs/jet/template
index 0a58b1559fbb8..5c1f5f9b30466 100644
--- a/srcpkgs/jet/template
+++ b/srcpkgs/jet/template
@@ -1,6 +1,6 @@
 # Template file for 'jet'
 pkgname=jet
-version=0.5.25
+version=0.6.26
 revision=1
 hostmakedepends="mandrel leiningen"
 makedepends="zlib-devel"
@@ -10,7 +10,7 @@ license="EPL-1.0"
 homepage="https://github.com/borkdude/jet"
 changelog="https://raw.githubusercontent.com/borkdude/jet/master/CHANGELOG.md"
 distfiles="https://github.com/borkdude/jet/archive/refs/tags/v${version}.tar.gz"
-checksum=9054dfd4406c4fb034c68eddda0996ca238345bd97695e579a7c0fdeeb639ab0
+checksum=671f6f1b14f9d2f2a3d698027edbf06036e367b2d0347ad6edf2fc81b39e0b6b
 nocross="mandrel"
 
 do_build() {

From 48af397de3af9ebf263c21f5673e631f345fdf10 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sun, 16 Jul 2023 16:10:23 +0530
Subject: [PATCH 2/3] babashka: update to 1.3.181.

---
 srcpkgs/babashka/template | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/babashka/template b/srcpkgs/babashka/template
index 30514d66c304c..2a51e5525ad1b 100644
--- a/srcpkgs/babashka/template
+++ b/srcpkgs/babashka/template
@@ -1,6 +1,6 @@
 # Template file for 'babashka'
 pkgname=babashka
-version=1.3.179
+version=1.3.181
 revision=1
 create_wrksrc=yes
 hostmakedepends="mandrel leiningen git"
@@ -11,14 +11,14 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="EPL-1.0"
 homepage="https://babashka.org/"
 changelog="https://github.com/babashka/babashka/raw/master/CHANGELOG.md"
-_sci_commit=e80d94a9cbf13127628ceddf531e1eed4e9f15de
+_sci_commit=348f6839495fe71f8f3b49680f12e95577d822a5
 _babashka_curl_commit=e936acd40544eb637b6041c7e89454b21eb7ee34
 _babashka_nrepl_commit=605788cd42dc35dc03a0276c9e9e5cc4e78e9a0b
 _depstar_commit=c419b8c82041855d55593c5b561fc7cea8234712
-_process_commit=dadcff417675c84dcd32448e22e6270d1555af5d
-_pods_commit=64ecb94de888a34aeb023eb7f50bfa1a34943f24
-_deps_clj_commit=2f93fe8ba712c855feb6ecf26d2ed70646b34356
-_fs_commit=ceb8f7f48d4a1438a434ffc16238d5f1883bb4ac
+_process_commit=0258a70aba8dc3dacc84dd9e01ae8e3f8c3672c0
+_pods_commit=6ad6045b94bc871c5107bfc75d39643b6c1bc8ba
+_deps_clj_commit=82adf0cb15249a753851579bc9fac0db52921778
+_fs_commit=c5c5365585efa44a6c4e8ca91bd84d9adc631a02
 _babashka_core_commit=52a6037bd4b632bffffb04394fb4efd0cdab6b1e
 distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.tar.gz
  https://github.com/borkdude/sci/archive/${_sci_commit}.tar.gz
@@ -30,15 +30,15 @@ distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.ta
  https://github.com/borkdude/deps.clj/archive/${_deps_clj_commit}.tar.gz
  https://github.com/babashka/fs/archive/${_fs_commit}.tar.gz
  https://github.com/babashka/babashka.core/archive/${_babashka_core_commit}.tar.gz"
-checksum="7c6b2dada8ce8107107dc776720ac7323fed3d3bec83dba7879432b9b61e6c18
- f9be60cfaef7f85696fa0a67108ecfdd21fdc977960b38b281e0cc93d9dd9da1
+checksum="bb20e76fa8d095a7827d8e80ff0ad741297a4afe597c99b1e7e7132b322bbe25
+ 39cf1e9e4d640d451917d683d42f8464f70b7f75b760d8c426f7af9f8f1bc11d
  6e60865ae2d4522c3de55b3b1daed51b42bb9bb6095b1d2fbd3620facece3257
  e76d1ce7a6905c6f588f1c55bec6797896459bca9c13a538d6fab9aa13603642
  9d214a10a4f5e4f15b9c80354dae85689a40e941ec3417203354c0dc3ce9457b
- 003d3d005d40f620df519b26808b3753500bc94eba333be904603a2c2e05db57
- b9ca2bd69aa510db91526e73523f3c2aeb14033fd8055346d51d7c5143262972
- f67dc9f220385b0048640e46a9952749cf5a55e457ecc9f6f5601d4ab23a3b85
- 8693d3d4cad5a6a198dbbcec2edc93d977711b1428235ff92e3c031495af0366
+ f443ca02859c2c44229f8a6d5d8be7b6a92fa1c9efa6af9edeab8e3947bff6f5
+ c858a68cb17cd173a8a39c3a76d72f7e134bc6dec0bdc111552842974762c335
+ 85de8d9f3a5992f5eb5a1551f8c1cfc0b5864dc57c0ba3425c3a98f1f5c6e544
+ 12b7a137a32d6cda68c401dd8679a475328559b26a080a6553e9a34e2a857eea
  bad285812bcc7de7e0dd905c5df99045d7f92d6e2e191fc2768c06adbaaeb709"
 
 # https://github.com/openjdk/jdk17u-dev/pull/783

From d4c3c07e78758f0ee6b33a3b30f0d414e2a3b9ca Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sat, 15 Jul 2023 22:45:28 +0530
Subject: [PATCH 3/3] mandrel: update to 23.0.0.0.

---
 srcpkgs/mandrel/files/musl.patch | 59 +++++++++++++++-----------------
 srcpkgs/mandrel/template         | 10 +++---
 2 files changed, 33 insertions(+), 36 deletions(-)

diff --git a/srcpkgs/mandrel/files/musl.patch b/srcpkgs/mandrel/files/musl.patch
index dda08a9857cec..a85991ab0927e 100644
--- a/srcpkgs/mandrel/files/musl.patch
+++ b/srcpkgs/mandrel/files/musl.patch
@@ -1,48 +1,45 @@
 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
-@@ -41,5 +41,4 @@
+--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/libc/HostedLibCFeature.java
++++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/libc/HostedLibCFeature.java
+@@ -56,7 +56,7 @@ public class HostedLibCFeature implements InternalFeature {
+                 if (!values.containsKey(this)) {
+                     return Platform.includedIn(Platform.ANDROID.class)
+                                     ? "bionic"
+-                                    : System.getProperty("substratevm.HostLibC", "glibc");
++                                    : "musl";
+                 }
+                 return (String) values.get(this);
+             }
+--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/libc/HostedMuslLibC.java
++++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/libc/HostedMuslLibC.java
+@@ -35,9 +35,7 @@ public class HostedMuslLibC extends MuslLibC implements HostedLibCBase {
      @Override
      public List<String> getAdditionalQueryCodeCompilerOptions() {
--        /* Avoid the dependency to muslc for builds cross compiling to muslc. */
--        return Collections.singletonList("--static");
+         /* Avoid the dependency to muslc for builds cross compiling to muslc. */
+-        return isCrossCompiling()
+-                        ? Collections.singletonList("--static")
+-                        : Collections.emptyList();
 +        return Collections.emptyList();
      }
-@@ -58,13 +52,6 @@
+ 
+     @Override
+@@ -47,17 +45,7 @@ public class HostedMuslLibC extends MuslLibC implements HostedLibCBase {
  
      @Override
      public boolean requiresLibCSpecificStaticJDKLibraries() {
--        return true;
+-        return isCrossCompiling();
 -    }
 -
 -    @Override
 -    public void checkIfLibCSupported() {
--        if (!SubstrateOptions.StaticExecutable.getValue()) {
--            throw UserError.abort("Musl can only be used for statically linked executables.");
+-        if (isCrossCompiling()) {
+-            if (!SubstrateOptions.StaticExecutable.getValue()) {
+-                System.err.println("Warning: Cross-compiling a musl-based native-image that is not an executable is an experimental feature!" +
+-                                "If omitting --static wasn't the intention, then --static should be used when compiling with --libc=musl");
+-            }
 -        }
 +        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 @@
-     return listen(fd, count);
- }
  
--JNIEXPORT int JNICALL JVM_Send(int fd, char* buf, size_t nBytes, uint flags) {
-+JNIEXPORT int JNICALL JVM_Send(int fd, char* buf, size_t nBytes, unsigned int flags) {
-     RESTARTABLE_RETURN_INT(send(fd, buf, nBytes, flags));
- }
- 
---- substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/linux/libc/LibCFeature.java.orig
-+++ substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/linux/libc/LibCFeature.java
-@@ -55,7 +55,7 @@
-             @Override
-             public String getValueOrDefault(UnmodifiableEconomicMap<OptionKey<?>, Object> values) {
-                 if (!values.containsKey(this)) {
--                    return Platform.includedIn(Platform.ANDROID.class) ? "bionic" : "glibc";
-+                    return Platform.includedIn(Platform.ANDROID.class) ? "bionic" : "musl";
-                 }
-                 return (String) values.get(this);
-             }
+     @Override
diff --git a/srcpkgs/mandrel/template b/srcpkgs/mandrel/template
index d75ca825cef10..2f06d2eb4711b 100644
--- a/srcpkgs/mandrel/template
+++ b/srcpkgs/mandrel/template
@@ -1,9 +1,9 @@
 # Template file for 'mandrel'
 pkgname=mandrel
-version=22.3.2.1
+version=23.0.0.0
 revision=1
 _java_ver=17
-_mx_ver=6.20.3
+_mx_ver=6.26.5
 archs="aarch64* x86_64*"  # upstream supported archs
 hostmakedepends="openjdk${_java_ver} openjdk${_java_ver}-jmods
  openjdk${_java_ver}-src openjdk${_java_ver}-static-libs python3"
@@ -15,9 +15,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="b109a1204ace963ec94523d1c2b5bffd2fa68aef8a79e2d650629324e911a890
- 4aab85f02bed302b763c036c1a3f392d974b0b4d4ddf22e297c3246744e16455
- b2d86d0169a790afdb7ec83e47ffd46ef8bdad5c37f6a635423624a4ee0c9c54"
+checksum="3eb9bf128f4a64a8efd19e100dd84e55cb3ae5eb4c3fcad8a074ddc1d5ed3ffb
+ ee88ef38950bd7a89aef18f6d4f9e6f56a4948ec0e9608a434a96311721af85b
+ 9e8f619b5001304d36ee1c3fd964e081977dc9f883c8028873390f9231374693"
 shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so"
 nocross=yes
 

Re: [PR PATCH] [Updated] mandrel: update to 23.0.0.0.

[icp1994]

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

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

https://github.com/icp1994/void-packages mandrel
https://github.com/void-linux/void-packages/pull/45056

mandrel: update to 23.0.0.0.
#### Testing the changes
- I tested the changes in this PR: **briefly** (built `jet`, included in PR)

#### Local build testing
- I built this PR locally for my native architecture: **x86_64**

cc @leahneukirchen 

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

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

From bff3dab133cde01400d0f2d45ddf95d2187d392d Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sat, 15 Jul 2023 22:35:02 +0530
Subject: [PATCH 1/3] jet: update to 0.6.26.

---
 srcpkgs/jet/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/jet/template b/srcpkgs/jet/template
index 0a58b1559fbb8..5c1f5f9b30466 100644
--- a/srcpkgs/jet/template
+++ b/srcpkgs/jet/template
@@ -1,6 +1,6 @@
 # Template file for 'jet'
 pkgname=jet
-version=0.5.25
+version=0.6.26
 revision=1
 hostmakedepends="mandrel leiningen"
 makedepends="zlib-devel"
@@ -10,7 +10,7 @@ license="EPL-1.0"
 homepage="https://github.com/borkdude/jet"
 changelog="https://raw.githubusercontent.com/borkdude/jet/master/CHANGELOG.md"
 distfiles="https://github.com/borkdude/jet/archive/refs/tags/v${version}.tar.gz"
-checksum=9054dfd4406c4fb034c68eddda0996ca238345bd97695e579a7c0fdeeb639ab0
+checksum=671f6f1b14f9d2f2a3d698027edbf06036e367b2d0347ad6edf2fc81b39e0b6b
 nocross="mandrel"
 
 do_build() {

From 48af397de3af9ebf263c21f5673e631f345fdf10 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sun, 16 Jul 2023 16:10:23 +0530
Subject: [PATCH 2/3] babashka: update to 1.3.181.

---
 srcpkgs/babashka/template | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/babashka/template b/srcpkgs/babashka/template
index 30514d66c304c..2a51e5525ad1b 100644
--- a/srcpkgs/babashka/template
+++ b/srcpkgs/babashka/template
@@ -1,6 +1,6 @@
 # Template file for 'babashka'
 pkgname=babashka
-version=1.3.179
+version=1.3.181
 revision=1
 create_wrksrc=yes
 hostmakedepends="mandrel leiningen git"
@@ -11,14 +11,14 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="EPL-1.0"
 homepage="https://babashka.org/"
 changelog="https://github.com/babashka/babashka/raw/master/CHANGELOG.md"
-_sci_commit=e80d94a9cbf13127628ceddf531e1eed4e9f15de
+_sci_commit=348f6839495fe71f8f3b49680f12e95577d822a5
 _babashka_curl_commit=e936acd40544eb637b6041c7e89454b21eb7ee34
 _babashka_nrepl_commit=605788cd42dc35dc03a0276c9e9e5cc4e78e9a0b
 _depstar_commit=c419b8c82041855d55593c5b561fc7cea8234712
-_process_commit=dadcff417675c84dcd32448e22e6270d1555af5d
-_pods_commit=64ecb94de888a34aeb023eb7f50bfa1a34943f24
-_deps_clj_commit=2f93fe8ba712c855feb6ecf26d2ed70646b34356
-_fs_commit=ceb8f7f48d4a1438a434ffc16238d5f1883bb4ac
+_process_commit=0258a70aba8dc3dacc84dd9e01ae8e3f8c3672c0
+_pods_commit=6ad6045b94bc871c5107bfc75d39643b6c1bc8ba
+_deps_clj_commit=82adf0cb15249a753851579bc9fac0db52921778
+_fs_commit=c5c5365585efa44a6c4e8ca91bd84d9adc631a02
 _babashka_core_commit=52a6037bd4b632bffffb04394fb4efd0cdab6b1e
 distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.tar.gz
  https://github.com/borkdude/sci/archive/${_sci_commit}.tar.gz
@@ -30,15 +30,15 @@ distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.ta
  https://github.com/borkdude/deps.clj/archive/${_deps_clj_commit}.tar.gz
  https://github.com/babashka/fs/archive/${_fs_commit}.tar.gz
  https://github.com/babashka/babashka.core/archive/${_babashka_core_commit}.tar.gz"
-checksum="7c6b2dada8ce8107107dc776720ac7323fed3d3bec83dba7879432b9b61e6c18
- f9be60cfaef7f85696fa0a67108ecfdd21fdc977960b38b281e0cc93d9dd9da1
+checksum="bb20e76fa8d095a7827d8e80ff0ad741297a4afe597c99b1e7e7132b322bbe25
+ 39cf1e9e4d640d451917d683d42f8464f70b7f75b760d8c426f7af9f8f1bc11d
  6e60865ae2d4522c3de55b3b1daed51b42bb9bb6095b1d2fbd3620facece3257
  e76d1ce7a6905c6f588f1c55bec6797896459bca9c13a538d6fab9aa13603642
  9d214a10a4f5e4f15b9c80354dae85689a40e941ec3417203354c0dc3ce9457b
- 003d3d005d40f620df519b26808b3753500bc94eba333be904603a2c2e05db57
- b9ca2bd69aa510db91526e73523f3c2aeb14033fd8055346d51d7c5143262972
- f67dc9f220385b0048640e46a9952749cf5a55e457ecc9f6f5601d4ab23a3b85
- 8693d3d4cad5a6a198dbbcec2edc93d977711b1428235ff92e3c031495af0366
+ f443ca02859c2c44229f8a6d5d8be7b6a92fa1c9efa6af9edeab8e3947bff6f5
+ c858a68cb17cd173a8a39c3a76d72f7e134bc6dec0bdc111552842974762c335
+ 85de8d9f3a5992f5eb5a1551f8c1cfc0b5864dc57c0ba3425c3a98f1f5c6e544
+ 12b7a137a32d6cda68c401dd8679a475328559b26a080a6553e9a34e2a857eea
  bad285812bcc7de7e0dd905c5df99045d7f92d6e2e191fc2768c06adbaaeb709"
 
 # https://github.com/openjdk/jdk17u-dev/pull/783

From c485f2e572146e55625912c16ba7b6c537d63d89 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sat, 15 Jul 2023 22:45:28 +0530
Subject: [PATCH 3/3] mandrel: update to 23.0.0.0.

---
 srcpkgs/mandrel/files/musl.patch | 59 +++++++++++++++-----------------
 srcpkgs/mandrel/template         | 10 +++---
 2 files changed, 33 insertions(+), 36 deletions(-)

diff --git a/srcpkgs/mandrel/files/musl.patch b/srcpkgs/mandrel/files/musl.patch
index dda08a9857cec..0e8c9c679bbe5 100644
--- a/srcpkgs/mandrel/files/musl.patch
+++ b/srcpkgs/mandrel/files/musl.patch
@@ -1,48 +1,45 @@
 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
-@@ -41,5 +41,4 @@
+--- substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/libc/HostedLibCFeature.java
++++ substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/libc/HostedLibCFeature.java
+@@ -56,7 +56,7 @@ public class HostedLibCFeature implements InternalFeature {
+                 if (!values.containsKey(this)) {
+                     return Platform.includedIn(Platform.ANDROID.class)
+                                     ? "bionic"
+-                                    : System.getProperty("substratevm.HostLibC", "glibc");
++                                    : "musl";
+                 }
+                 return (String) values.get(this);
+             }
+--- substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/libc/HostedMuslLibC.java
++++ substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/libc/HostedMuslLibC.java
+@@ -35,9 +35,7 @@ public class HostedMuslLibC extends MuslLibC implements HostedLibCBase {
      @Override
      public List<String> getAdditionalQueryCodeCompilerOptions() {
--        /* Avoid the dependency to muslc for builds cross compiling to muslc. */
--        return Collections.singletonList("--static");
+         /* Avoid the dependency to muslc for builds cross compiling to muslc. */
+-        return isCrossCompiling()
+-                        ? Collections.singletonList("--static")
+-                        : Collections.emptyList();
 +        return Collections.emptyList();
      }
-@@ -58,13 +52,6 @@
+ 
+     @Override
+@@ -47,17 +45,7 @@ public class HostedMuslLibC extends MuslLibC implements HostedLibCBase {
  
      @Override
      public boolean requiresLibCSpecificStaticJDKLibraries() {
--        return true;
+-        return isCrossCompiling();
 -    }
 -
 -    @Override
 -    public void checkIfLibCSupported() {
--        if (!SubstrateOptions.StaticExecutable.getValue()) {
--            throw UserError.abort("Musl can only be used for statically linked executables.");
+-        if (isCrossCompiling()) {
+-            if (!SubstrateOptions.StaticExecutable.getValue()) {
+-                System.err.println("Warning: Cross-compiling a musl-based native-image that is not an executable is an experimental feature!" +
+-                                "If omitting --static wasn't the intention, then --static should be used when compiling with --libc=musl");
+-            }
 -        }
 +        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 @@
-     return listen(fd, count);
- }
  
--JNIEXPORT int JNICALL JVM_Send(int fd, char* buf, size_t nBytes, uint flags) {
-+JNIEXPORT int JNICALL JVM_Send(int fd, char* buf, size_t nBytes, unsigned int flags) {
-     RESTARTABLE_RETURN_INT(send(fd, buf, nBytes, flags));
- }
- 
---- substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/linux/libc/LibCFeature.java.orig
-+++ substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/linux/libc/LibCFeature.java
-@@ -55,7 +55,7 @@
-             @Override
-             public String getValueOrDefault(UnmodifiableEconomicMap<OptionKey<?>, Object> values) {
-                 if (!values.containsKey(this)) {
--                    return Platform.includedIn(Platform.ANDROID.class) ? "bionic" : "glibc";
-+                    return Platform.includedIn(Platform.ANDROID.class) ? "bionic" : "musl";
-                 }
-                 return (String) values.get(this);
-             }
+     @Override
diff --git a/srcpkgs/mandrel/template b/srcpkgs/mandrel/template
index d75ca825cef10..2f06d2eb4711b 100644
--- a/srcpkgs/mandrel/template
+++ b/srcpkgs/mandrel/template
@@ -1,9 +1,9 @@
 # Template file for 'mandrel'
 pkgname=mandrel
-version=22.3.2.1
+version=23.0.0.0
 revision=1
 _java_ver=17
-_mx_ver=6.20.3
+_mx_ver=6.26.5
 archs="aarch64* x86_64*"  # upstream supported archs
 hostmakedepends="openjdk${_java_ver} openjdk${_java_ver}-jmods
  openjdk${_java_ver}-src openjdk${_java_ver}-static-libs python3"
@@ -15,9 +15,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="b109a1204ace963ec94523d1c2b5bffd2fa68aef8a79e2d650629324e911a890
- 4aab85f02bed302b763c036c1a3f392d974b0b4d4ddf22e297c3246744e16455
- b2d86d0169a790afdb7ec83e47ffd46ef8bdad5c37f6a635423624a4ee0c9c54"
+checksum="3eb9bf128f4a64a8efd19e100dd84e55cb3ae5eb4c3fcad8a074ddc1d5ed3ffb
+ ee88ef38950bd7a89aef18f6d4f9e6f56a4948ec0e9608a434a96311721af85b
+ 9e8f619b5001304d36ee1c3fd964e081977dc9f883c8028873390f9231374693"
 shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so"
 nocross=yes
 

Re: mandrel: update to 23.0.0.0.

[leahneukirchen]

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

New comment by leahneukirchen on void-packages repository

https://github.com/void-linux/void-packages/pull/45056#issuecomment-1663874766

Comment:
Something is wrong, bb and jet are still static binaries on x86_64-musl.

Re: mandrel: update to 23.0.0.0.

[icp1994]

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

New comment by icp1994 on void-packages repository

https://github.com/void-linux/void-packages/pull/45056#issuecomment-1664135679

Comment:
I'm a bit stumped. There's a `BABASHKA_STATIC` envvar that's being exported in these templates which add's `--static` to the native-image build args. See [Jet](https://github.com/borkdude/jet/blob/v0.7.27/script/compile#L30-L40) for example. If I patch that arg out from the compile scripts, I get:
```
=> jet-0.6.26_1: running post-install hook: 06-strip-and-debug-pkgs ...
   Stripped executable: /usr/bin/jet
=> ERROR: jet-0.6.26_1: non-PIE executable found in PIE build: /usr/bin/jet
=> ERROR: jet-0.6.26_1: post-install_06-strip-and-debug-pkgs: 'find ${PKGDESTDIR} -type f' exited with 1
```

Re: mandrel: update to 23.0.0.0.

[leahneukirchen]

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

New comment by leahneukirchen on void-packages repository

https://github.com/void-linux/void-packages/pull/45056#issuecomment-1664257963

Comment:
Hmm, looks like the linker doesn't get passed `fPIE` or so.

Re: mandrel: update to 23.0.0.0.

[leahneukirchen]

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

New comment by leahneukirchen on void-packages repository

https://github.com/void-linux/void-packages/pull/45056#issuecomment-1664267568

Comment:
You need to patch /mandrel-mandrel-23.0.0.0-Final/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/libc/HostedMuslLibC.java `getAdditionalLinkerOptions` which hard-codes `-no-pie`.

Re: mandrel: update to 23.0.0.0.

[leahneukirchen]

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

New comment by leahneukirchen on void-packages repository

https://github.com/void-linux/void-packages/pull/45056#issuecomment-1664274180

Comment:
ugh, I just now saw the TEXTREL comment there -.- perhaps we actually wanna static link. sorry.

Re: mandrel: update to 23.0.0.0.

[leahneukirchen]

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

New comment by leahneukirchen on void-packages repository

https://github.com/void-linux/void-packages/pull/45056#issuecomment-1664285911

Comment:
Indeed, bb builds fine as PIE executable but segfaults on startup with musl.

So let's scrap that, sorry for the distraction.

Re: mandrel: update to 23.0.0.0.

[leahneukirchen]

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

New comment by leahneukirchen on void-packages repository

https://github.com/void-linux/void-packages/pull/45056#issuecomment-1664289189

Comment:
Then this is good to go, I think!

Re: mandrel: update to 23.0.0.0.

[icp1994]

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

New comment by icp1994 on void-packages repository

https://github.com/void-linux/void-packages/pull/45056#issuecomment-1664305738

Comment:
Do you want me to remove the `musl.patch` file again then? I don't think it's doing anything we need.

Re: mandrel: update to 23.0.0.0.

[leahneukirchen]

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

New comment by leahneukirchen on void-packages repository

https://github.com/void-linux/void-packages/pull/45056#issuecomment-1664430499

Comment:
Okay, but please keep the line that non-static is broken on musl.

Re: [PR PATCH] [Updated] mandrel: update to 23.0.0.0.

[icp1994]

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

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

https://github.com/icp1994/void-packages mandrel
https://github.com/void-linux/void-packages/pull/45056

mandrel: update to 23.0.0.0.
#### Testing the changes
- I tested the changes in this PR: **briefly** (built `jet`, included in PR)

#### Local build testing
- I built this PR locally for my native architecture: **x86_64**

cc @leahneukirchen 

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

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

From 9bcad8c79e682390a5cb9d26053fefdb1044b2df Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sat, 15 Jul 2023 22:45:28 +0530
Subject: [PATCH 1/3] mandrel: update to 23.0.1.2.

---
 srcpkgs/mandrel/files/musl.patch | 48 --------------------------------
 srcpkgs/mandrel/template         | 19 +++++--------
 2 files changed, 7 insertions(+), 60 deletions(-)
 delete mode 100644 srcpkgs/mandrel/files/musl.patch

diff --git a/srcpkgs/mandrel/files/musl.patch b/srcpkgs/mandrel/files/musl.patch
deleted file mode 100644
index dda08a9857cec..0000000000000
--- a/srcpkgs/mandrel/files/musl.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-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
-@@ -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.emptyList();
-     }
-@@ -58,13 +52,6 @@
- 
-     @Override
-     public boolean requiresLibCSpecificStaticJDKLibraries() {
--        return true;
--    }
--
--    @Override
--    public void checkIfLibCSupported() {
--        if (!SubstrateOptions.StaticExecutable.getValue()) {
--            throw UserError.abort("Musl can only be used for statically linked executables.");
--        }
-+        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 @@
-     return listen(fd, count);
- }
- 
--JNIEXPORT int JNICALL JVM_Send(int fd, char* buf, size_t nBytes, uint flags) {
-+JNIEXPORT int JNICALL JVM_Send(int fd, char* buf, size_t nBytes, unsigned int flags) {
-     RESTARTABLE_RETURN_INT(send(fd, buf, nBytes, flags));
- }
- 
---- substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/linux/libc/LibCFeature.java.orig
-+++ substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/linux/libc/LibCFeature.java
-@@ -55,7 +55,7 @@
-             @Override
-             public String getValueOrDefault(UnmodifiableEconomicMap<OptionKey<?>, Object> values) {
-                 if (!values.containsKey(this)) {
--                    return Platform.includedIn(Platform.ANDROID.class) ? "bionic" : "glibc";
-+                    return Platform.includedIn(Platform.ANDROID.class) ? "bionic" : "musl";
-                 }
-                 return (String) values.get(this);
-             }
diff --git a/srcpkgs/mandrel/template b/srcpkgs/mandrel/template
index d75ca825cef10..758abee76e7e7 100644
--- a/srcpkgs/mandrel/template
+++ b/srcpkgs/mandrel/template
@@ -1,9 +1,9 @@
 # Template file for 'mandrel'
 pkgname=mandrel
-version=22.3.2.1
+version=23.0.1.2
 revision=1
 _java_ver=17
-_mx_ver=6.20.3
+_mx_ver=6.35.1
 archs="aarch64* x86_64*"  # upstream supported archs
 hostmakedepends="openjdk${_java_ver} openjdk${_java_ver}-jmods
  openjdk${_java_ver}-src openjdk${_java_ver}-static-libs python3"
@@ -15,19 +15,14 @@ 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="b109a1204ace963ec94523d1c2b5bffd2fa68aef8a79e2d650629324e911a890
- 4aab85f02bed302b763c036c1a3f392d974b0b4d4ddf22e297c3246744e16455
- b2d86d0169a790afdb7ec83e47ffd46ef8bdad5c37f6a635423624a4ee0c9c54"
+checksum="db8fdb0a0cf3c80226f301982e437c4a63cc7486f292784804475be1b5d5c900
+ 745c4cedead5d43a09d9b2a05be50e95df53c1923a5969d68f02b0d5a3f7fa55
+ 9580168c4fe32dd70609b22670c633cb4c5f25826841083f4e9cdd5d8fe7e59d"
 shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so"
 nocross=yes
 
-post_patch() {
-	if [ "$XBPS_TARGET_LIBC" = musl ]; then
-		# XXX: only static builds with native-image work
-		# (else TEXTREL issues)
-		patch --no-backup-if-mismatch -d mandrel-mandrel-* -p0 < ${FILESDIR}/musl.patch
-	fi
-}
+# XXX: only static builds with native-image work
+# (else TEXTREL issues)
 
 do_build() {
 	cd mandrel-packaging-*

From d4a71e05807186b34fa46103333b114d46d6dfc6 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sun, 16 Jul 2023 16:10:23 +0530
Subject: [PATCH 2/3] babashka: update to 1.3.182.

---
 srcpkgs/babashka/template | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/babashka/template b/srcpkgs/babashka/template
index 30514d66c304c..e96a9e42ae7e2 100644
--- a/srcpkgs/babashka/template
+++ b/srcpkgs/babashka/template
@@ -1,6 +1,6 @@
 # Template file for 'babashka'
 pkgname=babashka
-version=1.3.179
+version=1.3.182
 revision=1
 create_wrksrc=yes
 hostmakedepends="mandrel leiningen git"
@@ -11,14 +11,14 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="EPL-1.0"
 homepage="https://babashka.org/"
 changelog="https://github.com/babashka/babashka/raw/master/CHANGELOG.md"
-_sci_commit=e80d94a9cbf13127628ceddf531e1eed4e9f15de
+_sci_commit=8bdf41008291f36566e6f9e5fa37a5f93e50e5f1
 _babashka_curl_commit=e936acd40544eb637b6041c7e89454b21eb7ee34
 _babashka_nrepl_commit=605788cd42dc35dc03a0276c9e9e5cc4e78e9a0b
 _depstar_commit=c419b8c82041855d55593c5b561fc7cea8234712
-_process_commit=dadcff417675c84dcd32448e22e6270d1555af5d
-_pods_commit=64ecb94de888a34aeb023eb7f50bfa1a34943f24
-_deps_clj_commit=2f93fe8ba712c855feb6ecf26d2ed70646b34356
-_fs_commit=ceb8f7f48d4a1438a434ffc16238d5f1883bb4ac
+_process_commit=d24961a8b101ee1a95569256c9ddb260d0f9bb36
+_pods_commit=6ad6045b94bc871c5107bfc75d39643b6c1bc8ba
+_deps_clj_commit=bd6b36e2f1dc81351d86d78de08b5a904c3f6ac3
+_fs_commit=c5c5365585efa44a6c4e8ca91bd84d9adc631a02
 _babashka_core_commit=52a6037bd4b632bffffb04394fb4efd0cdab6b1e
 distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.tar.gz
  https://github.com/borkdude/sci/archive/${_sci_commit}.tar.gz
@@ -30,15 +30,15 @@ distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.ta
  https://github.com/borkdude/deps.clj/archive/${_deps_clj_commit}.tar.gz
  https://github.com/babashka/fs/archive/${_fs_commit}.tar.gz
  https://github.com/babashka/babashka.core/archive/${_babashka_core_commit}.tar.gz"
-checksum="7c6b2dada8ce8107107dc776720ac7323fed3d3bec83dba7879432b9b61e6c18
- f9be60cfaef7f85696fa0a67108ecfdd21fdc977960b38b281e0cc93d9dd9da1
+checksum="b4b813c314e45c4655062151112f3de1ab3ad4debbb45b442a0737cf5502be37
+ fb7812b10c0c6e968429c284a523c5dbd108034e30f0efd4b9bda184a921ec4f
  6e60865ae2d4522c3de55b3b1daed51b42bb9bb6095b1d2fbd3620facece3257
  e76d1ce7a6905c6f588f1c55bec6797896459bca9c13a538d6fab9aa13603642
  9d214a10a4f5e4f15b9c80354dae85689a40e941ec3417203354c0dc3ce9457b
- 003d3d005d40f620df519b26808b3753500bc94eba333be904603a2c2e05db57
- b9ca2bd69aa510db91526e73523f3c2aeb14033fd8055346d51d7c5143262972
- f67dc9f220385b0048640e46a9952749cf5a55e457ecc9f6f5601d4ab23a3b85
- 8693d3d4cad5a6a198dbbcec2edc93d977711b1428235ff92e3c031495af0366
+ 66ac3fb4824d17e7cfd2712f9d35c8f9965bd4252f933722e2b3ecbf135b539c
+ c858a68cb17cd173a8a39c3a76d72f7e134bc6dec0bdc111552842974762c335
+ 763aaed6c7fedfe6426521c8cb23ee0da2ae3c3e14f14784834fc7851baaa390
+ 12b7a137a32d6cda68c401dd8679a475328559b26a080a6553e9a34e2a857eea
  bad285812bcc7de7e0dd905c5df99045d7f92d6e2e191fc2768c06adbaaeb709"
 
 # https://github.com/openjdk/jdk17u-dev/pull/783

From bcdbd7772c98df08bf625ca76dfd65afaac1475b Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sat, 15 Jul 2023 22:35:02 +0530
Subject: [PATCH 3/3] jet: update to 0.7.27.

---
 srcpkgs/jet/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/jet/template b/srcpkgs/jet/template
index 0a58b1559fbb8..dc681766d2570 100644
--- a/srcpkgs/jet/template
+++ b/srcpkgs/jet/template
@@ -1,6 +1,6 @@
 # Template file for 'jet'
 pkgname=jet
-version=0.5.25
+version=0.7.27
 revision=1
 hostmakedepends="mandrel leiningen"
 makedepends="zlib-devel"
@@ -10,7 +10,7 @@ license="EPL-1.0"
 homepage="https://github.com/borkdude/jet"
 changelog="https://raw.githubusercontent.com/borkdude/jet/master/CHANGELOG.md"
 distfiles="https://github.com/borkdude/jet/archive/refs/tags/v${version}.tar.gz"
-checksum=9054dfd4406c4fb034c68eddda0996ca238345bd97695e579a7c0fdeeb639ab0
+checksum=3e473b00acd80c2caf3eeb314b7d5db4c8553d301354d0647a68c8a5082ed8d2
 nocross="mandrel"
 
 do_build() {

Re: [PR PATCH] [Merged]: mandrel: update to 23.0.1.2; update revdeps

[leahneukirchen]

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

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

mandrel: update to 23.0.1.2; update revdeps
https://github.com/void-linux/void-packages/pull/45056

Description:
#### Testing the changes
- I tested the changes in this PR: **briefly** (built `jet`, included in PR)

#### Local build testing
- I built this PR locally for my native architecture: **x86_64**

cc @leahneukirchen