Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

mandrel: update to 23.1.2.0. #48359

Merged
merged 3 commits into from
Jan 30, 2024
Merged

mandrel: update to 23.1.2.0. #48359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
de75b95
mandrel: update to 23.1.2.0.
icp1994 Dec 26, 2023
e902492
babashka: revbump for mandrel with JDK 21
icp1994 Jan 24, 2024
60adefe
jet: revbump for mandrel with JDK 21
icp1994 Jan 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions srcpkgs/babashka/template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down Expand Up @@ -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
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs change too, to mandrel21

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pushed that now, but bb -e '(babashka.process/exec "ls")' doesn't work still after the revbump.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need to fix that before merging then.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tried patching this in but it didn't help?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here's two build logs for identical babashka versions - bb_old.txt with mandrel-23.0.1.2 JDK 17, 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.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.


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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions srcpkgs/jet/template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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
Expand Down
12 changes: 6 additions & 6 deletions srcpkgs/mandrel/template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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

Expand Down
Loading