From b05de660068bf79fc0f9550517f4ffb153630729 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Mon, 5 Jul 2021 18:17:48 +0200 Subject: [PATCH 1/3] openjdk11: add openjdk11-static-libs subpackage. Needed for tooling related to GraalVM. --- srcpkgs/openjdk11-static-libs | 1 + srcpkgs/openjdk11/template | 13 +++++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) create mode 120000 srcpkgs/openjdk11-static-libs diff --git a/srcpkgs/openjdk11-static-libs b/srcpkgs/openjdk11-static-libs new file mode 120000 index 000000000000..8213494c49ed --- /dev/null +++ b/srcpkgs/openjdk11-static-libs @@ -0,0 +1 @@ +openjdk11 \ No newline at end of file diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template index 87b309bfa014..7ff1a89d3249 100644 --- a/srcpkgs/openjdk11/template +++ b/srcpkgs/openjdk11/template @@ -1,7 +1,7 @@ # Template file for 'openjdk11' pkgname=openjdk11 version=11.0.12+5 -revision=1 +revision=2 _java_ver="${version%%.*}" _openjdk_version="openjdk-${_java_ver}" wrksrc="jdk${_java_ver}u-jdk-${version}" @@ -24,7 +24,7 @@ configure_args=" --with-vendor-url="https://voidlinux.org/" --with-vendor-bug-url="https://github.com/void-linux/void-packages/issues" --with-vendor-vm-bug-url="https://github.com/void-linux/void-packages/issues"" -make_build_args="images $(vopt_if docs docs)" +make_build_args="images static-libs-image $(vopt_if docs docs)" make_check_target="test-hotspot-gtest" hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates openssl zlib-devel which make-ca" @@ -190,3 +190,12 @@ openjdk11-src_package() { vmove "usr/lib/jvm/openjdk11/lib/src.zip" } } + +openjdk11-static-libs_package() { + notstrip=yes + short_desc+=" -- static libs" + pkg_install() { + vmkdir usr/lib/jvm/openjdk${_java_ver} + vcopy build/*-normal-*-release/images/static-libs/lib "usr/lib/jvm/openjdk${_java_ver}" + } +} From 0eeccd9dffbd18541e73d870b859d248ea2aba62 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Tue, 6 Jul 2021 11:10:59 +0200 Subject: [PATCH 2/3] New package: mandrel-21.1.0.0 --- common/shlibs | 6 ++++++ srcpkgs/mandrel/template | 42 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+) create mode 100644 srcpkgs/mandrel/template diff --git a/common/shlibs b/common/shlibs index a30db98724d8..1053a671d9ac 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1837,6 +1837,12 @@ libawt_xawt.so openjdk10-bootstrap-10.0.2p13_1 libjava.so openjdk10-bootstrap-10.0.2p13_1 libjli.so openjdk10-bootstrap-10.0.2p13_1 libjvm.so openjdk10-bootstrap-10.0.2p13_1 +libjawt.so mandrel-21.1.0.0_1 +libawt.so mandrel-21.1.0.0_1 +libawt_xawt.so mandrel-21.1.0.0_1 +libjava.so mandrel-21.1.0.0_1 +libjli.so mandrel-21.1.0.0_1 +libjvm.so mandrel-21.1.0.0_1 libucl.so.5 libucl-0.8.1_6 libhandle.so.1 xfsprogs-3.2.1_1 libnfnetlink.so.0 libnfnetlink-1.0.1_1 diff --git a/srcpkgs/mandrel/template b/srcpkgs/mandrel/template new file mode 100644 index 000000000000..7cc343080729 --- /dev/null +++ b/srcpkgs/mandrel/template @@ -0,0 +1,42 @@ +# Template file for 'mandrel' +pkgname=mandrel +version=21.1.0.0 +revision=1 +_java_ver=11 +_mx_ver=5.304.3 +wrksrc="mandrel-${version}" +create_wrksrc=yes +hostmakedepends="openjdk${_java_ver} openjdk${_java_ver}-src + openjdk${_java_ver}-static-libs python3" +makedepends="zlib-devel" +depends="" +short_desc="Downstream distribution of the GraalVM community edition" +maintainer="Leah Neukirchen " +license="GPL-2.0-only, Classpath-exception-2.0" +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="3f99ec20491cf79f8be19dfabb8fea6a82ea673bf450f2701f293db44fba4c95 + 670dd01e196d51aac0e5e3a4aa9b92e6b3953e16efbc7b7f6bb9dc39f3d1f9a7 + b5d15a3ed5c4ab1a3d84055a84375acac67a344c91a3c8076c429ecff8062e9d" +shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so" + +do_build() { + cd mandrel-packaging-* + export JAVA_HOME=/usr/lib/jvm/openjdk${_java_ver} + $JAVA_HOME/bin/java -ea build.java \ + --mx-home $PWD/../mx-* \ + --mandrel-repo $PWD/../mandrel-mandrel-* \ + --verbose +} + +do_install() { + cd mandrel-packaging*/mandrel-java* + + vmkdir usr/lib/jvm/mandrel${_java_ver} + vcopy . usr/lib/jvm/mandrel${_java_ver} + + vlicense LICENSE + vlicense THIRD_PARTY_LICENSE.txt +} From 1bb7eed4d0a791566f6a8bc238c4ab6c5993dbfc Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Tue, 6 Jul 2021 11:11:04 +0200 Subject: [PATCH 3/3] New package: babashka-0.4.6 --- srcpkgs/babashka/template | 44 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 srcpkgs/babashka/template diff --git a/srcpkgs/babashka/template b/srcpkgs/babashka/template new file mode 100644 index 000000000000..7a1e05a2f711 --- /dev/null +++ b/srcpkgs/babashka/template @@ -0,0 +1,44 @@ +# Template file for 'babashka' +pkgname=babashka +version=0.4.6 +revision=1 +wrksrc=${pkgname} +hostmakedepends="mandrel leiningen git" +makedepends="zlib-devel" +checkdepends="clojure curl" +short_desc="Native, fast starting Clojure interpreter for scripting" +maintainer="Leah Neukirchen " +license="EPL-1.0" +homepage="https://babashka.org/" + +#distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.tar.gz" +#checksum=f39cc6ede7724ef6046615de30c2a4d2244b902d78237c8217f8d981c2f72818 + +do_fetch() { + git clone https://github.com/babashka/babashka.git + cd babashka + git checkout v${version} + git submodule update --init --recursive +} + +do_patch() { + vsed -i -e '/install native-image/d' script/compile +} + +do_build() { + export GRAALVM_HOME=/usr/lib/jvm/mandrel11 + lein deps + script/uberjar + script/compile +} + +do_check() { + export BABASHKA_TEST_ENV=native + script/test + script/run_lib_tests +} + +do_install() { + vbin bb + vlicense LICENSE +}