From fe0b703569e0266b932350d16833caad98f1b57e Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Wed, 20 Apr 2022 19:05:43 -0400 Subject: [PATCH 1/2] New package: openjdk17-jmods-17.0.3+5 --- srcpkgs/openjdk17-jmods | 1 + srcpkgs/openjdk17/template | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) create mode 120000 srcpkgs/openjdk17-jmods diff --git a/srcpkgs/openjdk17-jmods b/srcpkgs/openjdk17-jmods new file mode 120000 index 000000000000..99ab1cb1b0d2 --- /dev/null +++ b/srcpkgs/openjdk17-jmods @@ -0,0 +1 @@ +openjdk17 \ No newline at end of file diff --git a/srcpkgs/openjdk17/template b/srcpkgs/openjdk17/template index 7e368f9b687e..9dba58b0d0d7 100644 --- a/srcpkgs/openjdk17/template +++ b/srcpkgs/openjdk17/template @@ -168,7 +168,7 @@ post_install() { rm -rf ./ca } -subpackages="openjdk17-src openjdk17-jre openjdk17-doc" +subpackages="openjdk17-src openjdk17-jre openjdk17-doc openjdk17-jmods" openjdk17-jre_package() { shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so" @@ -223,3 +223,11 @@ openjdk17-src_package() { vmove "$_jdk_home/lib/src.zip" } } + +openjdk17-jmods_package() { + short_desc+=" - JMODs" + depends="${pkgname}-${version}_${revision}" + pkg_install() { + vmove $_jdk_home/jmods + } +} From 8f85fd3f277d8b27ab2569310694c634fbc3af8f Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Wed, 20 Apr 2022 19:06:37 -0400 Subject: [PATCH 2/2] openjdk17: update to 17.0.3+7. also disable for armv5 and 6, the arch is not supported --- srcpkgs/openjdk17/template | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/srcpkgs/openjdk17/template b/srcpkgs/openjdk17/template index 9dba58b0d0d7..2554e49c54ea 100644 --- a/srcpkgs/openjdk17/template +++ b/srcpkgs/openjdk17/template @@ -1,6 +1,6 @@ # Template file for 'openjdk17' pkgname=openjdk17 -version=17.0.3+5 +version=17.0.3+7 revision=1 _gtest_ver=1.8.1 _java_ver="${version%%.*}" @@ -44,7 +44,7 @@ license="GPL-2.0-only WITH Classpath-exception-2.0" homepage="http://openjdk.java.net/" distfiles="https://github.com/openjdk/jdk${_java_ver}u/archive/jdk-${version}.tar.gz https://github.com/google/googletest/archive/refs/tags/release-${_gtest_ver}.tar.gz" -checksum="a557f4d2972bbbbcdc12fa7e167ad60b4ee1461a9bc7ad259a003172c34e6331 +checksum="22575340d080a396442658356583d9c7dc0c44cefa52842fbfcf23eef23c39a0 9bf1fe5182a604b4135edc1a425ae356c9ad15e9b23f9f12a02e80184c3a249c" provides="java-environment-${version}_1" patch_args="-Np1 --directory=$build_wrksrc" @@ -53,10 +53,11 @@ patch_args="-Np1 --directory=$build_wrksrc" disable_parallel_build=yes build_options="docs" -# no hotspot JIT for ppc32 case "$XBPS_TARGET_MACHINE" in ppc64*) ;; + # no hotspot JIT for ppc32 ppc*) _use_zero=yes ;; + armv[56]*) broken="Unsupported architecture" ;; esac if [ -n "$_use_zero" ]; then @@ -81,11 +82,6 @@ else fi alternatives=" - java:/usr/bin/java:/${_jdk_home}/bin/java - java:/usr/bin/jfr:/${_jdk_home}/bin/jfr - java:/usr/bin/keytool:/${_jdk_home}/bin/keytool - java:/usr/bin/rmiregistry:/${_jdk_home}/bin/rmiregistry - jdk:/usr/bin/jar:/${_jdk_home}/bin/jar jdk:/usr/bin/jarsigner:/${_jdk_home}/bin/jarsigner jdk:/usr/bin/java:/${_jdk_home}/bin/java