* [PR PATCH] mandrel: update to 23.1.2.0.
@ 2024-01-24 20:37 icp1994
2024-01-25 12:52 ` [PR REVIEW] " leahneukirchen
` (14 more replies)
0 siblings, 15 replies; 16+ messages in thread
From: icp1994 @ 2024-01-24 20:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 560 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/48359
mandrel: update to 23.1.2.0.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture: **x86_64**
One `babashka` test fail, couldn't figure out why exactly.
cc @leahneukirchen
A patch file from https://github.com/void-linux/void-packages/pull/48359.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mandrel-48359.patch --]
[-- Type: text/x-diff, Size: 3835 bytes --]
From 5957a53c640b7c1eaeff116f4c29b1042931e13a Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
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 e324edc7ae9c2c191a60b15c3186fe733430c50e Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Thu, 25 Jan 2024 01:57:24 +0530
Subject: [PATCH 2/3] babashka: revbump for mandrel with JDK 21
---
srcpkgs/babashka/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/babashka/template b/srcpkgs/babashka/template
index 338809bee19fe..589a1024fb878 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"
@@ -59,7 +59,7 @@ post_extract() {
}
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 e8033a76c1dcc4bffde4cfe011b64d32766f1ca5 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
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
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR REVIEW] mandrel: update to 23.1.2.0.
2024-01-24 20:37 [PR PATCH] mandrel: update to 23.1.2.0 icp1994
@ 2024-01-25 12:52 ` leahneukirchen
2024-01-25 14:14 ` [PR PATCH] [Updated] " icp1994
` (13 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: leahneukirchen @ 2024-01-25 12:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 190 bytes --]
New review comment by leahneukirchen on void-packages repository
https://github.com/void-linux/void-packages/pull/48359#discussion_r1466327217
Comment:
This needs change too, to mandrel21
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Updated] mandrel: update to 23.1.2.0.
2024-01-24 20:37 [PR PATCH] mandrel: update to 23.1.2.0 icp1994
2024-01-25 12:52 ` [PR REVIEW] " leahneukirchen
@ 2024-01-25 14:14 ` icp1994
2024-01-25 14:17 ` [PR REVIEW] " icp1994
` (12 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: icp1994 @ 2024-01-25 14:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 565 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/48359
mandrel: update to 23.1.2.0.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture: **x86_64**
One `babashka` test fail, couldn't figure out why exactly.
cc @leahneukirchen
A patch file from https://github.com/void-linux/void-packages/pull/48359.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mandrel-48359.patch --]
[-- Type: text/x-diff, Size: 4147 bytes --]
From 617295286e5715e727015c2d82f9f6107a522b52 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
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 <pangolin@vivaldi.net>
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 <pangolin@vivaldi.net>
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
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR REVIEW] mandrel: update to 23.1.2.0.
2024-01-24 20:37 [PR PATCH] mandrel: update to 23.1.2.0 icp1994
2024-01-25 12:52 ` [PR REVIEW] " leahneukirchen
2024-01-25 14:14 ` [PR PATCH] [Updated] " icp1994
@ 2024-01-25 14:17 ` icp1994
2024-01-25 14:25 ` leahneukirchen
` (11 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: icp1994 @ 2024-01-25 14:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 245 bytes --]
New review comment by icp1994 on void-packages repository
https://github.com/void-linux/void-packages/pull/48359#discussion_r1466442670
Comment:
pushed that now, but `bb -e '(babashka.process/exec "ls")'` doesn't work still after the revbump.
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR REVIEW] mandrel: update to 23.1.2.0.
2024-01-24 20:37 [PR PATCH] mandrel: update to 23.1.2.0 icp1994
` (2 preceding siblings ...)
2024-01-25 14:17 ` [PR REVIEW] " icp1994
@ 2024-01-25 14:25 ` leahneukirchen
2024-01-27 9:57 ` icp1994
` (10 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: leahneukirchen @ 2024-01-25 14:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 195 bytes --]
New review comment by leahneukirchen on void-packages repository
https://github.com/void-linux/void-packages/pull/48359#discussion_r1466453791
Comment:
We need to fix that before merging then.
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR REVIEW] mandrel: update to 23.1.2.0.
2024-01-24 20:37 [PR PATCH] mandrel: update to 23.1.2.0 icp1994
` (3 preceding siblings ...)
2024-01-25 14:25 ` leahneukirchen
@ 2024-01-27 9:57 ` icp1994
2024-01-27 17:56 ` leahneukirchen
` (9 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: icp1994 @ 2024-01-27 9:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 744 bytes --]
New review comment by icp1994 on void-packages repository
https://github.com/void-linux/void-packages/pull/48359#discussion_r1468434486
Comment:
When building `babashka`, under `--module-path` it has
```
/usr/lib/jvm/mandrel21/lib/svm-preview/builder/svm-foreign.jar:/usr/lib/jvm/mandrel21/lib/jvmci/word.jar:/usr/lib/jvm/mandrel21/lib/jvmci/nativeimage.jar:/usr/lib/jvm/mandrel21/lib/jvmci/collections.jar:/usr/lib/jvm/mandrel21/lib/truffle/truffle-compiler.jar:/usr/lib/jvm/mandrel21/lib/svm/builder/pointsto.jar:/usr/lib/jvm/mandrel21/lib/svm/builder/svm.jar:/usr/lib/jvm/mandrel21/lib/svm/builder/objectfile.jar:/usr/lib/jvm/mandrel21/lib/svm/builder/native-image-base.jar
```
Isn't that one supposed to have `graal-sdk.jar` as well?
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR REVIEW] mandrel: update to 23.1.2.0.
2024-01-24 20:37 [PR PATCH] mandrel: update to 23.1.2.0 icp1994
` (4 preceding siblings ...)
2024-01-27 9:57 ` icp1994
@ 2024-01-27 17:56 ` leahneukirchen
2024-01-28 14:20 ` icp1994
` (8 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: leahneukirchen @ 2024-01-27 17:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 199 bytes --]
New review comment by leahneukirchen on void-packages repository
https://github.com/void-linux/void-packages/pull/48359#discussion_r1468542868
Comment:
I tried patching this in but it didn't help?
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR REVIEW] mandrel: update to 23.1.2.0.
2024-01-24 20:37 [PR PATCH] mandrel: update to 23.1.2.0 icp1994
` (5 preceding siblings ...)
2024-01-27 17:56 ` leahneukirchen
@ 2024-01-28 14:20 ` icp1994
2024-01-30 13:51 ` leahneukirchen
` (7 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: icp1994 @ 2024-01-28 14:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 623 bytes --]
New review comment by icp1994 on void-packages repository
https://github.com/void-linux/void-packages/pull/48359#discussion_r1468870313
Comment:
Here's two build logs for identical `babashka` versions - [bb_old.txt](https://github.com/void-linux/void-packages/files/14076338/bb_old.txt) with mandrel-23.0.1.2 JDK 17, [bb_new.txt](https://github.com/void-linux/void-packages/files/14076337/bb_new.txt) with mandrel-23.1.2.0 JDK 21. Diffing them, the missing `graal-sdk.jar` in the later's `--module-path` should be the issue. Maybe a change in graal/mandrel internal across versions? Dunno how to go about debugging that.
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR REVIEW] mandrel: update to 23.1.2.0.
2024-01-24 20:37 [PR PATCH] mandrel: update to 23.1.2.0 icp1994
` (6 preceding siblings ...)
2024-01-28 14:20 ` icp1994
@ 2024-01-30 13:51 ` leahneukirchen
2024-01-30 13:59 ` leahneukirchen
` (6 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: leahneukirchen @ 2024-01-30 13:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 533 bytes --]
New review comment by leahneukirchen on void-packages repository
https://github.com/void-linux/void-packages/pull/48359#discussion_r1471254350
Comment:
So, the difference is that on mandrel 17 this graal-sdk.jar contains lots of things, but on mandrel 21 it just contains some properties. The actual classes are in the svm*jar things.
Babashka exec needs the class org.graalvm.nativeimage.ProcessProperties to exist, which used to be in graal-sdk.jar but is now in jvmci/nativeimage.jar... which is in module-path already tho.
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: mandrel: update to 23.1.2.0.
2024-01-24 20:37 [PR PATCH] mandrel: update to 23.1.2.0 icp1994
` (7 preceding siblings ...)
2024-01-30 13:51 ` leahneukirchen
@ 2024-01-30 13:59 ` leahneukirchen
2024-01-30 14:05 ` icp1994
` (5 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: leahneukirchen @ 2024-01-30 13:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 638 bytes --]
New comment by leahneukirchen on void-packages repository
https://github.com/void-linux/void-packages/pull/48359#issuecomment-1916913484
Comment:
This fixes it:
```
--- a/srcpkgs/babashka/template
+++ b/srcpkgs/babashka/template
@@ -55,7 +55,7 @@ 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/mandrel21/lib/jvmci/graal-sdk.jar"]@' project.clj
+ vsed -i -e '/:resource-paths/s@]@ "/usr/lib/jvm/mandrel21/lib/jvmci/nativeimage.jar"]@' project.clj
}
do_build() {
```
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: mandrel: update to 23.1.2.0.
2024-01-24 20:37 [PR PATCH] mandrel: update to 23.1.2.0 icp1994
` (8 preceding siblings ...)
2024-01-30 13:59 ` leahneukirchen
@ 2024-01-30 14:05 ` icp1994
2024-01-30 14:12 ` [PR PATCH] [Updated] " icp1994
` (4 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: icp1994 @ 2024-01-30 14:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 256 bytes --]
New comment by icp1994 on void-packages repository
https://github.com/void-linux/void-packages/pull/48359#issuecomment-1916934123
Comment:
Haha yeah, just finished building that & coming here to say changing that line in resource-path worked :laughing:
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Updated] mandrel: update to 23.1.2.0.
2024-01-24 20:37 [PR PATCH] mandrel: update to 23.1.2.0 icp1994
` (9 preceding siblings ...)
2024-01-30 14:05 ` icp1994
@ 2024-01-30 14:12 ` icp1994
2024-01-30 14:33 ` leahneukirchen
` (3 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: icp1994 @ 2024-01-30 14:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 565 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/48359
mandrel: update to 23.1.2.0.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture: **x86_64**
One `babashka` test fail, couldn't figure out why exactly.
cc @leahneukirchen
A patch file from https://github.com/void-linux/void-packages/pull/48359.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mandrel-48359.patch --]
[-- Type: text/x-diff, Size: 4149 bytes --]
From de75b950aaa5ca15a1183bb6ce498eaa35b97506 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
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 e902492863bec1cac5e6240a0ca6dd42d1119f75 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
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..d9342bee85cc1 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/nativeimage.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 60adefe2972a4f7ffd4d4c011c10126901adf0e3 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
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
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: mandrel: update to 23.1.2.0.
2024-01-24 20:37 [PR PATCH] mandrel: update to 23.1.2.0 icp1994
` (10 preceding siblings ...)
2024-01-30 14:12 ` [PR PATCH] [Updated] " icp1994
@ 2024-01-30 14:33 ` leahneukirchen
2024-01-30 14:47 ` icp1994
` (2 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: leahneukirchen @ 2024-01-30 14:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 189 bytes --]
New comment by leahneukirchen on void-packages repository
https://github.com/void-linux/void-packages/pull/48359#issuecomment-1917007862
Comment:
Test failures are due to GitHub I think.
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: mandrel: update to 23.1.2.0.
2024-01-24 20:37 [PR PATCH] mandrel: update to 23.1.2.0 icp1994
` (11 preceding siblings ...)
2024-01-30 14:33 ` leahneukirchen
@ 2024-01-30 14:47 ` icp1994
2024-01-30 17:29 ` leahneukirchen
2024-01-30 17:30 ` [PR PATCH] [Merged]: " leahneukirchen
14 siblings, 0 replies; 16+ messages in thread
From: icp1994 @ 2024-01-30 14:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2591 bytes --]
New comment by icp1994 on void-packages repository
https://github.com/void-linux/void-packages/pull/48359#issuecomment-1917054303
Comment:
Failed for me locally too - total five failures
```
testing me.raynes.core-test
fail in (test162279) (/builddir/babashka-1.3.188/test-resources/lib_tests/me/raynes/core_test.clj:262)
expected: (clojure.core/= (home (system/getproperty "user.name")) env-home)
actual: (not (clojure.core/= #object[java.io.file 0x66c24010 "/icp"] #object[java.io.file 0x33958938 "/tmp"]))
fail in (expands-to-given-user-162009) (/builddir/babashka-1.3.188/test-resources/lib_tests/me/raynes/core_test.clj:36)
expected: (clojure.core/= (expand-home (str "~" name)) (file user))
actual: (not (clojure.core/= #object[java.io.file 0x5f3807cd "/icp"] #object[java.io.file 0x1d6ebfaf "/tmp"]))
fail in (expands-to-given-user-162009) (/builddir/babashka-1.3.188/test-resources/lib_tests/me/raynes/core_test.clj:36)
expected: (clojure.core/= (expand-home (format "~%s/foo" name)) (file user "foo"))
actual: (not (clojure.core/= #object[java.io.file 0x210ec0be "/icp/foo"] #object[java.io.file 0x4f58a0db "/tmp/foo"]))
Ran 40 tests containing 80 assertions.
3 failures, 0 errors.
```
```
Testing babashka.process-exec-test
- calling babashka as: ./bb
- which resolves to: /builddir/babashka-1.3.188/bb
- babashka v1.3.188
- using exec runner: ["/builddir/babashka-1.3.188/bb" "process/test-native/src/babashka/test_native/run_exec.clj"]
=== exec-failure-to-launch-throws-an-exception-test
=== exec-env-option-test
=== resolves-program-test
=== arg0-mac-and-linux-test
FAIL in (arg0-mac-and-linux-test) (/builddir/babashka-1.3.188/process/test/babashka/process_exec_test.clj:113)
on macOS and Linux, arg0 is supported baseline - not overriden
expected: (= {:args (format "%s %s :ps-me" bb u/wd)} (-> (run-exec (format "%s %s :ps-me" bb u/wd)) :out edn/read-string))
actual: (not (= {:args "./bb process/script/wd.clj :ps-me"} nil))
FAIL in (arg0-mac-and-linux-test) (/builddir/babashka-1.3.188/process/test/babashka/process_exec_test.clj:113)
on macOS and Linux, arg0 is supported
expected: (= {:args (format "newarg0 %s :ps-me" u/wd)} (-> (run-exec {:arg0 "newarg0"} (format "%s %s :ps-me" bb u/wd)) :out edn/read-string))
actual: (not (= {:args "newarg0 process/script/wd.clj :ps-me"} nil))
=== pre-start-fn-test
=== cmd-opt-test
=== exec-replaces-runner-that-launches-it-test
Ran 7 tests containing 15 assertions.
2 failures, 0 errors.
```
```
{:test 2403, :pass 14908, :fail 5, :error 0}
```
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: mandrel: update to 23.1.2.0.
2024-01-24 20:37 [PR PATCH] mandrel: update to 23.1.2.0 icp1994
` (12 preceding siblings ...)
2024-01-30 14:47 ` icp1994
@ 2024-01-30 17:29 ` leahneukirchen
2024-01-30 17:30 ` [PR PATCH] [Merged]: " leahneukirchen
14 siblings, 0 replies; 16+ messages in thread
From: leahneukirchen @ 2024-01-30 17:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 206 bytes --]
New comment by leahneukirchen on void-packages repository
https://github.com/void-linux/void-packages/pull/48359#issuecomment-1917546708
Comment:
These fail due to the container chroot. Let's merge this.
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Merged]: mandrel: update to 23.1.2.0.
2024-01-24 20:37 [PR PATCH] mandrel: update to 23.1.2.0 icp1994
` (13 preceding siblings ...)
2024-01-30 17:29 ` leahneukirchen
@ 2024-01-30 17:30 ` leahneukirchen
14 siblings, 0 replies; 16+ messages in thread
From: leahneukirchen @ 2024-01-30 17:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 409 bytes --]
There's a merged pull request on the void-packages repository
mandrel: update to 23.1.2.0.
https://github.com/void-linux/void-packages/pull/48359
Description:
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture: **x86_64**
One `babashka` test fail, couldn't figure out why exactly.
cc @leahneukirchen
^ permalink raw reply [flat|nested] 16+ messages in thread
end of thread, other threads:[~2024-01-30 17:30 UTC | newest]
Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-01-24 20:37 [PR PATCH] mandrel: update to 23.1.2.0 icp1994
2024-01-25 12:52 ` [PR REVIEW] " leahneukirchen
2024-01-25 14:14 ` [PR PATCH] [Updated] " icp1994
2024-01-25 14:17 ` [PR REVIEW] " icp1994
2024-01-25 14:25 ` leahneukirchen
2024-01-27 9:57 ` icp1994
2024-01-27 17:56 ` leahneukirchen
2024-01-28 14:20 ` icp1994
2024-01-30 13:51 ` leahneukirchen
2024-01-30 13:59 ` leahneukirchen
2024-01-30 14:05 ` icp1994
2024-01-30 14:12 ` [PR PATCH] [Updated] " icp1994
2024-01-30 14:33 ` leahneukirchen
2024-01-30 14:47 ` icp1994
2024-01-30 17:29 ` leahneukirchen
2024-01-30 17:30 ` [PR PATCH] [Merged]: " leahneukirchen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).