From 617295286e5715e727015c2d82f9f6107a522b52 Mon Sep 17 00:00:00 2001 From: icp Date: Tue, 26 Dec 2023 22:26:53 +0530 Subject: [PATCH 1/3] mandrel: update to 23.1.2.0. Switch to JDK 21. --- srcpkgs/mandrel/template | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/srcpkgs/mandrel/template b/srcpkgs/mandrel/template index 11c4f28e516dc..87467d35eac57 100644 --- a/srcpkgs/mandrel/template +++ b/srcpkgs/mandrel/template @@ -1,9 +1,9 @@ # Template file for 'mandrel' pkgname=mandrel -version=23.0.1.2 +version=23.1.2.0 revision=1 -_java_ver=17 -_mx_ver=6.35.1 +_java_ver=21 +_mx_ver=6.53.2 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="db8fdb0a0cf3c80226f301982e437c4a63cc7486f292784804475be1b5d5c900 - 745c4cedead5d43a09d9b2a05be50e95df53c1923a5969d68f02b0d5a3f7fa55 - 9580168c4fe32dd70609b22670c633cb4c5f25826841083f4e9cdd5d8fe7e59d" +checksum="8ab941d0cfddebb8f1efd0595ee0ff53683381570d795a85e8a235f164c5b911 + a86005c3b2f6178859e3c7d9f64cd5b4f060723bd6e218e5f77226d7b293e850 + 567c95449922b448d78daade5ba7bd91729a75367b69806f1bd590988a1ef717" shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so" nocross=yes From 5f93abbbaab37c689be5a52d77699205f1a7ead7 Mon Sep 17 00:00:00 2001 From: icp Date: Thu, 25 Jan 2024 01:57:24 +0530 Subject: [PATCH 2/3] babashka: revbump for mandrel with JDK 21 --- srcpkgs/babashka/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/babashka/template b/srcpkgs/babashka/template index 338809bee19fe..7ff90cdfaeed4 100644 --- a/srcpkgs/babashka/template +++ b/srcpkgs/babashka/template @@ -1,7 +1,7 @@ # Template file for 'babashka' pkgname=babashka version=1.3.188 -revision=1 +revision=2 create_wrksrc=yes hostmakedepends="mandrel leiningen git" makedepends="zlib-devel" @@ -55,11 +55,11 @@ post_extract() { # Mandrel doesn't have GraalVM-SDK in the default classpath, # but some Babashka features require it. - vsed -i -e '/:resource-paths/s@]@ "/usr/lib/jvm/mandrel17/lib/jvmci/graal-sdk.jar"]@' project.clj + vsed -i -e '/:resource-paths/s@]@ "/usr/lib/jvm/mandrel21/lib/jvmci/graal-sdk.jar"]@' project.clj } do_build() { - export GRAALVM_HOME=/usr/lib/jvm/mandrel17 + export GRAALVM_HOME=/usr/lib/jvm/mandrel21 if [ "$XBPS_TARGET_LIBC" = musl ]; then export BABASHKA_MUSL=true export BABASHKA_STATIC=true # mandrel workaround @@ -71,7 +71,7 @@ do_build() { } do_check() { - export GRAALVM_HOME=/usr/lib/jvm/mandrel17 + export GRAALVM_HOME=/usr/lib/jvm/mandrel21 export BABASHKA_TEST_ENV=native script/test script/run_lib_tests From de451f26f4db001fd9c8cd97b8b1e839dccc843c Mon Sep 17 00:00:00 2001 From: icp Date: Thu, 25 Jan 2024 01:57:24 +0530 Subject: [PATCH 3/3] jet: revbump for mandrel with JDK 21 --- srcpkgs/jet/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/jet/template b/srcpkgs/jet/template index dc681766d2570..b0c3f7c399784 100644 --- a/srcpkgs/jet/template +++ b/srcpkgs/jet/template @@ -1,7 +1,7 @@ # Template file for 'jet' pkgname=jet version=0.7.27 -revision=1 +revision=2 hostmakedepends="mandrel leiningen" makedepends="zlib-devel" short_desc="CLI to transform between JSON, EDN and Transit" @@ -14,7 +14,7 @@ checksum=3e473b00acd80c2caf3eeb314b7d5db4c8553d301354d0647a68c8a5082ed8d2 nocross="mandrel" do_build() { - export GRAALVM_HOME=/usr/lib/jvm/mandrel17 + export GRAALVM_HOME=/usr/lib/jvm/mandrel21 if [ "$XBPS_TARGET_LIBC" = musl ]; then export BABASHKA_MUSL=true export BABASHKA_STATIC=true