From 969ff3eeca9fba7486ac122fdf856e9d114c890c Mon Sep 17 00:00:00 2001 From: icp 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 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 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, 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