From 2d66aa1b1618c4ff6ac6328fa8e480bc46ff66e4 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Wed, 1 Mar 2023 11:12:36 -0500 Subject: [PATCH 1/3] openjdk11: remove useless nostrep from -static-libs it wasn't doing anything anyways, it was "notstrip" --- srcpkgs/openjdk11/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template index 173aac14b5d5..9039332ad868 100644 --- a/srcpkgs/openjdk11/template +++ b/srcpkgs/openjdk11/template @@ -212,7 +212,6 @@ openjdk11-src_package() { } openjdk11-static-libs_package() { - notstrip=yes short_desc+=" - static libs" pkg_install() { vmkdir $_jdk_home From c6cefd053e0ce040e84a47aab09b943b6dc3c3fe Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Wed, 1 Mar 2023 11:13:09 -0500 Subject: [PATCH 2/3] openjdk17: static libs subpackage --- srcpkgs/openjdk17-static-libs | 1 + srcpkgs/openjdk17/template | 12 ++++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) create mode 120000 srcpkgs/openjdk17-static-libs diff --git a/srcpkgs/openjdk17-static-libs b/srcpkgs/openjdk17-static-libs new file mode 120000 index 000000000000..99ab1cb1b0d2 --- /dev/null +++ b/srcpkgs/openjdk17-static-libs @@ -0,0 +1 @@ +openjdk17 \ No newline at end of file diff --git a/srcpkgs/openjdk17/template b/srcpkgs/openjdk17/template index e4b6a8a3b5bb..c72606b9311d 100644 --- a/srcpkgs/openjdk17/template +++ b/srcpkgs/openjdk17/template @@ -30,7 +30,7 @@ configure_args="--disable-warnings-as-errors --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_install_args="INSTALL_PREFIX=\"${DESTDIR}/usr/lib\"" make_check_target="test-hotspot-gtest" hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates @@ -166,7 +166,7 @@ post_install() { rm -rf ./ca } -subpackages="openjdk17-src openjdk17-jre openjdk17-doc openjdk17-jmods" +subpackages="openjdk17-src openjdk17-jre openjdk17-doc openjdk17-jmods openjdk17-static-libs" openjdk17-jre_package() { shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so" @@ -219,6 +219,14 @@ openjdk17-src_package() { } } +openjdk11-static-libs_package() { + short_desc+=" - static libs" + pkg_install() { + vmkdir $_jdk_home + vcopy build/*-normal-*-release/images/static-libs/lib $_jdk_home + } +} + openjdk17-jmods_package() { short_desc+=" - JMODs" depends="${pkgname}-${version}_${revision}" From fd4b6602f37ba0e0c05097a1a17aa0018fbf40f2 Mon Sep 17 00:00:00 2001 From: icp Date: Wed, 21 Dec 2022 21:01:10 +0530 Subject: [PATCH 3/3] mandrel: update to 22.3.1.0. --- srcpkgs/mandrel/template | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/srcpkgs/mandrel/template b/srcpkgs/mandrel/template index a0b0701df206..503d264c2394 100644 --- a/srcpkgs/mandrel/template +++ b/srcpkgs/mandrel/template @@ -1,11 +1,10 @@ # Template file for 'mandrel' pkgname=mandrel -version=22.1.0.0 +version=22.3.1.0 revision=1 -_java_ver=11 -_mx_ver=6.1.2 +_java_ver=17 +_mx_ver=6.16.0 archs="aarch64* x86_64*" # upstream supported archs -create_wrksrc=yes hostmakedepends="openjdk${_java_ver} openjdk${_java_ver}-jmods openjdk${_java_ver}-src openjdk${_java_ver}-static-libs python3" makedepends="zlib-devel" @@ -16,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="a93ef67c75c52ff90faba95236100c4f702df2de87593b9bb00da3a2cbec3a23 - 8cf3aefe5f9aa7869ddaf02376be5febc20831461ce524c912f3f22fbf922863 - ae7a7d2a195666e32126f51dad5b55abbc204a13e89582172cc461a29ae84205" +checksum="dd37f4a8f628b8909228f489e12363427df9d0f95d1afedad39a2443b22a806d + bfe15128e8ffb5fd108ee20477e5ee1572c63405d6d0b93d905185356128dcec + aeec921e0669c72575dd9af54b5d5413d744dac590c82db46ae2bf60c4dfeb1b" shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so" nocross=yes @@ -32,6 +31,7 @@ post_patch() { do_build() { cd mandrel-packaging-* + export PATH=/usr/libexec/chroot-git:$PATH export JAVA_HOME=/usr/lib/jvm/openjdk${_java_ver} $JAVA_HOME/bin/java -ea build.java \ --mx-home $PWD/../mx-* \