Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] openjdk11: cleanup, split jre into subpackage
@ 2022-04-04 16:29 classabbyamp
  2022-04-04 16:31 ` [PR PATCH] [Updated] " classabbyamp
                   ` (17 more replies)
  0 siblings, 18 replies; 19+ messages in thread
From: classabbyamp @ 2022-04-04 16:29 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1437 bytes --]

There is a new pull request by classabbyamp against master on the void-packages repository

https://github.com/classabbyamp/void-packages openjdk11-cleanup
https://github.com/void-linux/void-packages/pull/36520

openjdk11: cleanup, split jre into subpackage
- openjdk11: clean up template
- New package: openjdk11-jre-11.0.12+5.

This should bring openjdk11 more in-line with other openjdk package templates

cc: @knusbaum for maintainer review

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/36520.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openjdk11-cleanup-36520.patch --]
[-- Type: text/x-diff, Size: 10420 bytes --]

From e843792847ec8001a2e857f6f01d0e787d8fc795 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Mon, 4 Apr 2022 12:15:17 -0400
Subject: [PATCH 1/2] openjdk11: clean up template

---
 srcpkgs/openjdk11/template | 110 ++++++++++++++++++-------------------
 1 file changed, 55 insertions(+), 55 deletions(-)

diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index bd38c0c5c010..01f7e1484d80 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -1,9 +1,9 @@
 # Template file for 'openjdk11'
 pkgname=openjdk11
 version=11.0.12+5
-revision=2
+revision=4
 _java_ver="${version%%.*}"
-_openjdk_version="openjdk-${_java_ver}"
+_jdk_home="usr/lib/jvm/openjdk${_java_ver}"
 wrksrc="jdk${_java_ver}u-jdk-${version}"
 build_style=gnu-configure
 configure_args="
@@ -68,50 +68,50 @@ if [ ! "$CROSS_BUILD" ]; then
 	configure_args+=" --with-boot-jdk=/usr/lib/jvm/java-10-openjdk"
 else
 	hostmakedepends+=" openjdk11"
-	configure_args+=" --with-boot-jdk=/usr/lib/jvm/openjdk11"
+	configure_args+=" --with-boot-jdk=/${_jdk_home}"
 fi
 
 alternatives="
- java:/usr/bin/java:/usr/lib/jvm/openjdk11/bin/java
- java:/usr/bin/jjs:/usr/lib/jvm/openjdk11/bin/jjs
- java:/usr/bin/keytool:/usr/lib/jvm/openjdk11/bin/keytool
- java:/usr/bin/pack200:/usr/lib/jvm/openjdk11/bin/pack200
- java:/usr/bin/rmid:/usr/lib/jvm/openjdk11/bin/rmid
- java:/usr/bin/rmiregistry:/usr/lib/jvm/openjdk11/bin/rmiregistry
- java:/usr/bin/unpack200:/usr/lib/jvm/openjdk11/bin/unpack200
+ java:/usr/bin/java:/${_jdk_home}/bin/java
+ java:/usr/bin/jjs:/${_jdk_home}/bin/jjs
+ java:/usr/bin/keytool:/${_jdk_home}/bin/keytool
+ java:/usr/bin/pack200:/${_jdk_home}/bin/pack200
+ java:/usr/bin/rmid:/${_jdk_home}/bin/rmid
+ java:/usr/bin/rmiregistry:/${_jdk_home}/bin/rmiregistry
+ java:/usr/bin/unpack200:/${_jdk_home}/bin/unpack200
 
- jdk:/usr/bin/jaotc:/usr/lib/jvm/openjdk11/bin/jaotc
- jdk:/usr/bin/jar:/usr/lib/jvm/openjdk11/bin/jar
- jdk:/usr/bin/jarsigner:/usr/lib/jvm/openjdk11/bin/jarsigner
- jdk:/usr/bin/java:/usr/lib/jvm/openjdk11/bin/java
- jdk:/usr/bin/javac:/usr/lib/jvm/openjdk11/bin/javac
- jdk:/usr/bin/javadoc:/usr/lib/jvm/openjdk11/bin/javadoc
- jdk:/usr/bin/javap:/usr/lib/jvm/openjdk11/bin/javap
- jdk:/usr/bin/jcmd:/usr/lib/jvm/openjdk11/bin/jcmd
- jdk:/usr/bin/jconsole:/usr/lib/jvm/openjdk11/bin/jconsole
- jdk:/usr/bin/jdb:/usr/lib/jvm/openjdk11/bin/jdb
- jdk:/usr/bin/jdeprscan:/usr/lib/jvm/openjdk11/bin/jdeprscan
- jdk:/usr/bin/jdeps:/usr/lib/jvm/openjdk11/bin/jdeps
- jdk:/usr/bin/jhsdb:/usr/lib/jvm/openjdk11/bin/jhsdb
- jdk:/usr/bin/jimage:/usr/lib/jvm/openjdk11/bin/jimage
- jdk:/usr/bin/jinfo:/usr/lib/jvm/openjdk11/bin/jinfo
- jdk:/usr/bin/jjs:/usr/lib/jvm/openjdk11/bin/jjs
- jdk:/usr/bin/jlink:/usr/lib/jvm/openjdk11/bin/jlink
- jdk:/usr/bin/jmap:/usr/lib/jvm/openjdk11/bin/jmap
- jdk:/usr/bin/jmod:/usr/lib/jvm/openjdk11/bin/jmod
- jdk:/usr/bin/jps:/usr/lib/jvm/openjdk11/bin/jps
- jdk:/usr/bin/jrunscript:/usr/lib/jvm/openjdk11/bin/jrunscript
- jdk:/usr/bin/jshell:/usr/lib/jvm/openjdk11/bin/jshell
- jdk:/usr/bin/jstack:/usr/lib/jvm/openjdk11/bin/jstack
- jdk:/usr/bin/jstat:/usr/lib/jvm/openjdk11/bin/jstat
- jdk:/usr/bin/jstatd:/usr/lib/jvm/openjdk11/bin/jstatd
- jdk:/usr/bin/keytool:/usr/lib/jvm/openjdk11/bin/keytool
- jdk:/usr/bin/pack200:/usr/lib/jvm/openjdk11/bin/pack200
- jdk:/usr/bin/rmic:/usr/lib/jvm/openjdk11/bin/rmic
- jdk:/usr/bin/rmid:/usr/lib/jvm/openjdk11/bin/rmid
- jdk:/usr/bin/rmiregistry:/usr/lib/jvm/openjdk11/bin/rmiregistry
- jdk:/usr/bin/serialver:/usr/lib/jvm/openjdk11/bin/serialver
- jdk:/usr/bin/unpack200:/usr/lib/jvm/openjdk11/bin/unpack200
+ jdk:/usr/bin/jaotc:/${_jdk_home}/bin/jaotc
+ jdk:/usr/bin/jar:/${_jdk_home}/bin/jar
+ jdk:/usr/bin/jarsigner:/${_jdk_home}/bin/jarsigner
+ jdk:/usr/bin/java:/${_jdk_home}/bin/java
+ jdk:/usr/bin/javac:/${_jdk_home}/bin/javac
+ jdk:/usr/bin/javadoc:/${_jdk_home}/bin/javadoc
+ jdk:/usr/bin/javap:/${_jdk_home}/bin/javap
+ jdk:/usr/bin/jcmd:/${_jdk_home}/bin/jcmd
+ jdk:/usr/bin/jconsole:/${_jdk_home}/bin/jconsole
+ jdk:/usr/bin/jdb:/${_jdk_home}/bin/jdb
+ jdk:/usr/bin/jdeprscan:/${_jdk_home}/bin/jdeprscan
+ jdk:/usr/bin/jdeps:/${_jdk_home}/bin/jdeps
+ jdk:/usr/bin/jhsdb:/${_jdk_home}/bin/jhsdb
+ jdk:/usr/bin/jimage:/${_jdk_home}/bin/jimage
+ jdk:/usr/bin/jinfo:/${_jdk_home}/bin/jinfo
+ jdk:/usr/bin/jjs:/${_jdk_home}/bin/jjs
+ jdk:/usr/bin/jlink:/${_jdk_home}/bin/jlink
+ jdk:/usr/bin/jmap:/${_jdk_home}/bin/jmap
+ jdk:/usr/bin/jmod:/${_jdk_home}/bin/jmod
+ jdk:/usr/bin/jps:/${_jdk_home}/bin/jps
+ jdk:/usr/bin/jrunscript:/${_jdk_home}/bin/jrunscript
+ jdk:/usr/bin/jshell:/${_jdk_home}/bin/jshell
+ jdk:/usr/bin/jstack:/${_jdk_home}/bin/jstack
+ jdk:/usr/bin/jstat:/${_jdk_home}/bin/jstat
+ jdk:/usr/bin/jstatd:/${_jdk_home}/bin/jstatd
+ jdk:/usr/bin/keytool:/${_jdk_home}/bin/keytool
+ jdk:/usr/bin/pack200:/${_jdk_home}/bin/pack200
+ jdk:/usr/bin/rmic:/${_jdk_home}/bin/rmic
+ jdk:/usr/bin/rmid:/${_jdk_home}/bin/rmid
+ jdk:/usr/bin/rmiregistry:/${_jdk_home}/bin/rmiregistry
+ jdk:/usr/bin/serialver:/${_jdk_home}/bin/serialver
+ jdk:/usr/bin/unpack200:/${_jdk_home}/bin/unpack200
 "
 
 post_extract() {
@@ -151,11 +151,11 @@ do_configure() {
 }
 
 do_install() {
-	vmkdir usr/lib/jvm/openjdk${_java_ver}
-	vcopy build/*-normal-*-release/images/jdk/* "usr/lib/jvm/openjdk${_java_ver}"
-	vmkdir usr/lib/jvm/$_openjdk_version/lib/security
-	make-ca -g -f --destdir "${PWD}/ca" -k "${DESTDIR}/usr/lib/jvm/openjdk${_java_ver}/bin/keytool"
-	mv ./ca/etc/pki/tls/java/cacerts ${DESTDIR}/usr/lib/jvm/openjdk${_java_ver}/lib/security/
+	vmkdir $_jdk_home
+	vcopy build/*-normal-*-release/images/jdk/* $_jdk_home
+	vmkdir $_jdk_home/lib/security
+	make-ca -g -f --destdir "${PWD}/ca" -k $DESTDIR/$_jdk_home/bin/keytool
+	mv ./ca/etc/pki/tls/java/cacerts $DESTDIR/$_jdk_home/lib/security/
 	chmod -R ugo+rw ./ca
 	rm -Rf ./ca
 	vmkdir etc/profile.d
@@ -170,14 +170,14 @@ openjdk11-doc_package() {
 	nostrip=yes
 	noverifyrdeps=yes
 	noshlibprovides=yes
-	short_desc+=" -- documentation"
+	short_desc+=" - documentation"
 	pkg_install() {
 		cd ${wrksrc}
 		if [ "$build_option_docs" ]; then
 			vmkdir usr/share/doc/openjdk11
-			cp -a build/linux-*/images/docs/* ${PKGDESTDIR}/usr/share/doc/openjdk11
+			cp -a build/linux-*/images/docs/* $PKGDESTDIR/usr/share/doc/openjdk11
 		fi
-		vmove usr/lib/jvm/openjdk11/man/man1
+		vmove $_jdk_home/man/man1
 	}
 }
 
@@ -185,17 +185,17 @@ openjdk11-src_package() {
 	nostrip=yes
 	noverifyrdeps=yes
 	noshlibprovides=yes
-	short_desc+=" -- sources"
+	short_desc+=" - sources"
 	pkg_install() {
-		vmove "usr/lib/jvm/openjdk11/lib/src.zip"
+		vmove $_jdk_home/lib/src.zip
 	}
 }
 
 openjdk11-static-libs_package() {
 	notstrip=yes
-	short_desc+=" -- static libs"
+	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}"
+		vmkdir $_jdk_home
+		vcopy build/*-normal-*-release/images/static-libs/lib $_jdk_home
 	}
 }

From 229fa5c604c52eeb53e9a2cd6d5433b7ae5e73d5 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Mon, 4 Apr 2022 12:25:32 -0400
Subject: [PATCH 2/2] New package: openjdk11-jre-11.0.12+5.

---
 common/shlibs              | 12 ++++++------
 srcpkgs/openjdk11/template | 35 ++++++++++++++++++++++++++++++++---
 2 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 307cb13347fc..f77f30c048ea 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1809,12 +1809,12 @@ libawt_xawt.so openjdk8-jre-8u20_1
 libjava.so openjdk8-jre-8u20_1
 libjli.so openjdk8-jre-8u20_1
 libjvm.so openjdk8-jre-8u20_1
-libjawt.so openjdk11-11.0.5+10_1
-libawt.so openjdk11-11.0.5+10_1
-libawt_xawt.so openjdk11-11.0.5+10_1
-libjava.so openjdk11-11.0.5+10_1
-libjli.so openjdk11-11.0.5+10_1
-libjvm.so openjdk11-11.0.5+10_1
+libjawt.so openjdk11-jre-11.0.5+10_1
+libawt.so openjdk11-jre-11.0.5+10_1
+libawt_xawt.so openjdk11-jre-11.0.5+10_1
+libjava.so openjdk11-jre-11.0.5+10_1
+libjli.so openjdk11-jre-11.0.5+10_1
+libjvm.so openjdk11-jre-11.0.5+10_1
 libjawt.so openjdk7-bootstrap-7u221b02_1
 libawt.so openjdk7-bootstrap-7u221b02_1
 libawt_xawt.so openjdk7-bootstrap-7u221b02_1
diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index 01f7e1484d80..e52436b93e0b 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -31,15 +31,14 @@ hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
 makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
  fontconfig-devel zlib-devel lcms2-devel"
-depends="fontconfig"
+depends="${pkgname}-jre-${version}_${revision}"
 short_desc="OpenJDK Java Development Kit"
 maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="GPL-2.0-only WITH Classpath-exception-2.0"
 homepage="http://openjdk.java.net/"
 distfiles="https://hg.openjdk.java.net/jdk-updates/jdk${_java_ver}u/archive/jdk-${version}.tar.gz"
 checksum=ff0edaf800c76ae435840365a9205a5f7277a5a2fd3c79ad874522a15c213559
-provides="java-environment-${version}_1 java-runtime-${version}_1"
-shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so"
+provides="java-environment-${version}_1"
 
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes
@@ -166,6 +165,36 @@ EOF
 	vlicense LICENSE
 }
 
+subpackages="openjdk11-src openjdk11-jre openjdk11-doc openjdk11-static-libs"
+
+openjdk11-jre_package() {
+	shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so"
+	short_desc+=" - runtime components"
+	provides="java-runtime-${version}_1"
+	depends="fontconfig"
+	alternatives="
+	 java:/usr/bin/java:/${_jdk_home}/bin/java
+	 java:/usr/bin/jjs:/${_jdk_home}/bin/jjs
+	 java:/usr/bin/keytool:/${_jdk_home}/bin/keytool
+	 java:/usr/bin/pack200:/${_jdk_home}/bin/pack200
+	 java:/usr/bin/rmid:/${_jdk_home}/bin/rmid
+	 java:/usr/bin/rmiregistry:/${_jdk_home}/bin/rmiregistry
+	 java:/usr/bin/unpack200:/${_jdk_home}/bin/unpack200
+	"
+	pkg_install() {
+		for bf in java jjs keytool pack200 rmid rmiregistry unpack200; do
+			vmove $_jdk_home/bin/$bf
+		done
+
+		for f in lib legal conf release; do
+			vmove $_jdk_home/$f
+		done
+
+		vlicense ASSEMBLY_EXCEPTION
+		vlicense LICENSE
+	}
+}
+
 openjdk11-doc_package() {
 	nostrip=yes
 	noverifyrdeps=yes

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PR PATCH] [Updated] openjdk11: cleanup, split jre into subpackage
  2022-04-04 16:29 [PR PATCH] openjdk11: cleanup, split jre into subpackage classabbyamp
@ 2022-04-04 16:31 ` classabbyamp
  2022-04-04 16:36 ` classabbyamp
                   ` (16 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: classabbyamp @ 2022-04-04 16:31 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1442 bytes --]

There is an updated pull request by classabbyamp against master on the void-packages repository

https://github.com/classabbyamp/void-packages openjdk11-cleanup
https://github.com/void-linux/void-packages/pull/36520

openjdk11: cleanup, split jre into subpackage
- openjdk11: clean up template
- New package: openjdk11-jre-11.0.12+5.

This should bring openjdk11 more in-line with other openjdk package templates

cc: @knusbaum for maintainer review

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/36520.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openjdk11-cleanup-36520.patch --]
[-- Type: text/x-diff, Size: 10420 bytes --]

From d54e1d4191420fb7e79f56c06efa1c23d6ec2cd5 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Mon, 4 Apr 2022 12:15:17 -0400
Subject: [PATCH 1/2] openjdk11: clean up template

---
 srcpkgs/openjdk11/template | 110 ++++++++++++++++++-------------------
 1 file changed, 55 insertions(+), 55 deletions(-)

diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index bd38c0c5c010..2c670d92ee1d 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -1,9 +1,9 @@
 # Template file for 'openjdk11'
 pkgname=openjdk11
 version=11.0.12+5
-revision=2
+revision=3
 _java_ver="${version%%.*}"
-_openjdk_version="openjdk-${_java_ver}"
+_jdk_home="usr/lib/jvm/openjdk${_java_ver}"
 wrksrc="jdk${_java_ver}u-jdk-${version}"
 build_style=gnu-configure
 configure_args="
@@ -68,50 +68,50 @@ if [ ! "$CROSS_BUILD" ]; then
 	configure_args+=" --with-boot-jdk=/usr/lib/jvm/java-10-openjdk"
 else
 	hostmakedepends+=" openjdk11"
-	configure_args+=" --with-boot-jdk=/usr/lib/jvm/openjdk11"
+	configure_args+=" --with-boot-jdk=/${_jdk_home}"
 fi
 
 alternatives="
- java:/usr/bin/java:/usr/lib/jvm/openjdk11/bin/java
- java:/usr/bin/jjs:/usr/lib/jvm/openjdk11/bin/jjs
- java:/usr/bin/keytool:/usr/lib/jvm/openjdk11/bin/keytool
- java:/usr/bin/pack200:/usr/lib/jvm/openjdk11/bin/pack200
- java:/usr/bin/rmid:/usr/lib/jvm/openjdk11/bin/rmid
- java:/usr/bin/rmiregistry:/usr/lib/jvm/openjdk11/bin/rmiregistry
- java:/usr/bin/unpack200:/usr/lib/jvm/openjdk11/bin/unpack200
+ java:/usr/bin/java:/${_jdk_home}/bin/java
+ java:/usr/bin/jjs:/${_jdk_home}/bin/jjs
+ java:/usr/bin/keytool:/${_jdk_home}/bin/keytool
+ java:/usr/bin/pack200:/${_jdk_home}/bin/pack200
+ java:/usr/bin/rmid:/${_jdk_home}/bin/rmid
+ java:/usr/bin/rmiregistry:/${_jdk_home}/bin/rmiregistry
+ java:/usr/bin/unpack200:/${_jdk_home}/bin/unpack200
 
- jdk:/usr/bin/jaotc:/usr/lib/jvm/openjdk11/bin/jaotc
- jdk:/usr/bin/jar:/usr/lib/jvm/openjdk11/bin/jar
- jdk:/usr/bin/jarsigner:/usr/lib/jvm/openjdk11/bin/jarsigner
- jdk:/usr/bin/java:/usr/lib/jvm/openjdk11/bin/java
- jdk:/usr/bin/javac:/usr/lib/jvm/openjdk11/bin/javac
- jdk:/usr/bin/javadoc:/usr/lib/jvm/openjdk11/bin/javadoc
- jdk:/usr/bin/javap:/usr/lib/jvm/openjdk11/bin/javap
- jdk:/usr/bin/jcmd:/usr/lib/jvm/openjdk11/bin/jcmd
- jdk:/usr/bin/jconsole:/usr/lib/jvm/openjdk11/bin/jconsole
- jdk:/usr/bin/jdb:/usr/lib/jvm/openjdk11/bin/jdb
- jdk:/usr/bin/jdeprscan:/usr/lib/jvm/openjdk11/bin/jdeprscan
- jdk:/usr/bin/jdeps:/usr/lib/jvm/openjdk11/bin/jdeps
- jdk:/usr/bin/jhsdb:/usr/lib/jvm/openjdk11/bin/jhsdb
- jdk:/usr/bin/jimage:/usr/lib/jvm/openjdk11/bin/jimage
- jdk:/usr/bin/jinfo:/usr/lib/jvm/openjdk11/bin/jinfo
- jdk:/usr/bin/jjs:/usr/lib/jvm/openjdk11/bin/jjs
- jdk:/usr/bin/jlink:/usr/lib/jvm/openjdk11/bin/jlink
- jdk:/usr/bin/jmap:/usr/lib/jvm/openjdk11/bin/jmap
- jdk:/usr/bin/jmod:/usr/lib/jvm/openjdk11/bin/jmod
- jdk:/usr/bin/jps:/usr/lib/jvm/openjdk11/bin/jps
- jdk:/usr/bin/jrunscript:/usr/lib/jvm/openjdk11/bin/jrunscript
- jdk:/usr/bin/jshell:/usr/lib/jvm/openjdk11/bin/jshell
- jdk:/usr/bin/jstack:/usr/lib/jvm/openjdk11/bin/jstack
- jdk:/usr/bin/jstat:/usr/lib/jvm/openjdk11/bin/jstat
- jdk:/usr/bin/jstatd:/usr/lib/jvm/openjdk11/bin/jstatd
- jdk:/usr/bin/keytool:/usr/lib/jvm/openjdk11/bin/keytool
- jdk:/usr/bin/pack200:/usr/lib/jvm/openjdk11/bin/pack200
- jdk:/usr/bin/rmic:/usr/lib/jvm/openjdk11/bin/rmic
- jdk:/usr/bin/rmid:/usr/lib/jvm/openjdk11/bin/rmid
- jdk:/usr/bin/rmiregistry:/usr/lib/jvm/openjdk11/bin/rmiregistry
- jdk:/usr/bin/serialver:/usr/lib/jvm/openjdk11/bin/serialver
- jdk:/usr/bin/unpack200:/usr/lib/jvm/openjdk11/bin/unpack200
+ jdk:/usr/bin/jaotc:/${_jdk_home}/bin/jaotc
+ jdk:/usr/bin/jar:/${_jdk_home}/bin/jar
+ jdk:/usr/bin/jarsigner:/${_jdk_home}/bin/jarsigner
+ jdk:/usr/bin/java:/${_jdk_home}/bin/java
+ jdk:/usr/bin/javac:/${_jdk_home}/bin/javac
+ jdk:/usr/bin/javadoc:/${_jdk_home}/bin/javadoc
+ jdk:/usr/bin/javap:/${_jdk_home}/bin/javap
+ jdk:/usr/bin/jcmd:/${_jdk_home}/bin/jcmd
+ jdk:/usr/bin/jconsole:/${_jdk_home}/bin/jconsole
+ jdk:/usr/bin/jdb:/${_jdk_home}/bin/jdb
+ jdk:/usr/bin/jdeprscan:/${_jdk_home}/bin/jdeprscan
+ jdk:/usr/bin/jdeps:/${_jdk_home}/bin/jdeps
+ jdk:/usr/bin/jhsdb:/${_jdk_home}/bin/jhsdb
+ jdk:/usr/bin/jimage:/${_jdk_home}/bin/jimage
+ jdk:/usr/bin/jinfo:/${_jdk_home}/bin/jinfo
+ jdk:/usr/bin/jjs:/${_jdk_home}/bin/jjs
+ jdk:/usr/bin/jlink:/${_jdk_home}/bin/jlink
+ jdk:/usr/bin/jmap:/${_jdk_home}/bin/jmap
+ jdk:/usr/bin/jmod:/${_jdk_home}/bin/jmod
+ jdk:/usr/bin/jps:/${_jdk_home}/bin/jps
+ jdk:/usr/bin/jrunscript:/${_jdk_home}/bin/jrunscript
+ jdk:/usr/bin/jshell:/${_jdk_home}/bin/jshell
+ jdk:/usr/bin/jstack:/${_jdk_home}/bin/jstack
+ jdk:/usr/bin/jstat:/${_jdk_home}/bin/jstat
+ jdk:/usr/bin/jstatd:/${_jdk_home}/bin/jstatd
+ jdk:/usr/bin/keytool:/${_jdk_home}/bin/keytool
+ jdk:/usr/bin/pack200:/${_jdk_home}/bin/pack200
+ jdk:/usr/bin/rmic:/${_jdk_home}/bin/rmic
+ jdk:/usr/bin/rmid:/${_jdk_home}/bin/rmid
+ jdk:/usr/bin/rmiregistry:/${_jdk_home}/bin/rmiregistry
+ jdk:/usr/bin/serialver:/${_jdk_home}/bin/serialver
+ jdk:/usr/bin/unpack200:/${_jdk_home}/bin/unpack200
 "
 
 post_extract() {
@@ -151,11 +151,11 @@ do_configure() {
 }
 
 do_install() {
-	vmkdir usr/lib/jvm/openjdk${_java_ver}
-	vcopy build/*-normal-*-release/images/jdk/* "usr/lib/jvm/openjdk${_java_ver}"
-	vmkdir usr/lib/jvm/$_openjdk_version/lib/security
-	make-ca -g -f --destdir "${PWD}/ca" -k "${DESTDIR}/usr/lib/jvm/openjdk${_java_ver}/bin/keytool"
-	mv ./ca/etc/pki/tls/java/cacerts ${DESTDIR}/usr/lib/jvm/openjdk${_java_ver}/lib/security/
+	vmkdir $_jdk_home
+	vcopy build/*-normal-*-release/images/jdk/* $_jdk_home
+	vmkdir $_jdk_home/lib/security
+	make-ca -g -f --destdir "${PWD}/ca" -k $DESTDIR/$_jdk_home/bin/keytool
+	mv ./ca/etc/pki/tls/java/cacerts $DESTDIR/$_jdk_home/lib/security/
 	chmod -R ugo+rw ./ca
 	rm -Rf ./ca
 	vmkdir etc/profile.d
@@ -170,14 +170,14 @@ openjdk11-doc_package() {
 	nostrip=yes
 	noverifyrdeps=yes
 	noshlibprovides=yes
-	short_desc+=" -- documentation"
+	short_desc+=" - documentation"
 	pkg_install() {
 		cd ${wrksrc}
 		if [ "$build_option_docs" ]; then
 			vmkdir usr/share/doc/openjdk11
-			cp -a build/linux-*/images/docs/* ${PKGDESTDIR}/usr/share/doc/openjdk11
+			cp -a build/linux-*/images/docs/* $PKGDESTDIR/usr/share/doc/openjdk11
 		fi
-		vmove usr/lib/jvm/openjdk11/man/man1
+		vmove $_jdk_home/man/man1
 	}
 }
 
@@ -185,17 +185,17 @@ openjdk11-src_package() {
 	nostrip=yes
 	noverifyrdeps=yes
 	noshlibprovides=yes
-	short_desc+=" -- sources"
+	short_desc+=" - sources"
 	pkg_install() {
-		vmove "usr/lib/jvm/openjdk11/lib/src.zip"
+		vmove $_jdk_home/lib/src.zip
 	}
 }
 
 openjdk11-static-libs_package() {
 	notstrip=yes
-	short_desc+=" -- static libs"
+	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}"
+		vmkdir $_jdk_home
+		vcopy build/*-normal-*-release/images/static-libs/lib $_jdk_home
 	}
 }

From 240fca263593a42a2453b4d5432b26edecc7cb52 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Mon, 4 Apr 2022 12:25:32 -0400
Subject: [PATCH 2/2] New package: openjdk11-jre-11.0.12+5.

---
 common/shlibs              | 12 ++++++------
 srcpkgs/openjdk11/template | 35 ++++++++++++++++++++++++++++++++---
 2 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 307cb13347fc..f77f30c048ea 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1809,12 +1809,12 @@ libawt_xawt.so openjdk8-jre-8u20_1
 libjava.so openjdk8-jre-8u20_1
 libjli.so openjdk8-jre-8u20_1
 libjvm.so openjdk8-jre-8u20_1
-libjawt.so openjdk11-11.0.5+10_1
-libawt.so openjdk11-11.0.5+10_1
-libawt_xawt.so openjdk11-11.0.5+10_1
-libjava.so openjdk11-11.0.5+10_1
-libjli.so openjdk11-11.0.5+10_1
-libjvm.so openjdk11-11.0.5+10_1
+libjawt.so openjdk11-jre-11.0.5+10_1
+libawt.so openjdk11-jre-11.0.5+10_1
+libawt_xawt.so openjdk11-jre-11.0.5+10_1
+libjava.so openjdk11-jre-11.0.5+10_1
+libjli.so openjdk11-jre-11.0.5+10_1
+libjvm.so openjdk11-jre-11.0.5+10_1
 libjawt.so openjdk7-bootstrap-7u221b02_1
 libawt.so openjdk7-bootstrap-7u221b02_1
 libawt_xawt.so openjdk7-bootstrap-7u221b02_1
diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index 2c670d92ee1d..803595de1570 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -31,15 +31,14 @@ hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
 makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
  fontconfig-devel zlib-devel lcms2-devel"
-depends="fontconfig"
+depends="${pkgname}-jre-${version}_${revision}"
 short_desc="OpenJDK Java Development Kit"
 maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="GPL-2.0-only WITH Classpath-exception-2.0"
 homepage="http://openjdk.java.net/"
 distfiles="https://hg.openjdk.java.net/jdk-updates/jdk${_java_ver}u/archive/jdk-${version}.tar.gz"
 checksum=ff0edaf800c76ae435840365a9205a5f7277a5a2fd3c79ad874522a15c213559
-provides="java-environment-${version}_1 java-runtime-${version}_1"
-shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so"
+provides="java-environment-${version}_1"
 
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes
@@ -166,6 +165,36 @@ EOF
 	vlicense LICENSE
 }
 
+subpackages="openjdk11-src openjdk11-jre openjdk11-doc openjdk11-static-libs"
+
+openjdk11-jre_package() {
+	shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so"
+	short_desc+=" - runtime components"
+	provides="java-runtime-${version}_1"
+	depends="fontconfig"
+	alternatives="
+	 java:/usr/bin/java:/${_jdk_home}/bin/java
+	 java:/usr/bin/jjs:/${_jdk_home}/bin/jjs
+	 java:/usr/bin/keytool:/${_jdk_home}/bin/keytool
+	 java:/usr/bin/pack200:/${_jdk_home}/bin/pack200
+	 java:/usr/bin/rmid:/${_jdk_home}/bin/rmid
+	 java:/usr/bin/rmiregistry:/${_jdk_home}/bin/rmiregistry
+	 java:/usr/bin/unpack200:/${_jdk_home}/bin/unpack200
+	"
+	pkg_install() {
+		for bf in java jjs keytool pack200 rmid rmiregistry unpack200; do
+			vmove $_jdk_home/bin/$bf
+		done
+
+		for f in lib legal conf release; do
+			vmove $_jdk_home/$f
+		done
+
+		vlicense ASSEMBLY_EXCEPTION
+		vlicense LICENSE
+	}
+}
+
 openjdk11-doc_package() {
 	nostrip=yes
 	noverifyrdeps=yes

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PR PATCH] [Updated] openjdk11: cleanup, split jre into subpackage
  2022-04-04 16:29 [PR PATCH] openjdk11: cleanup, split jre into subpackage classabbyamp
  2022-04-04 16:31 ` [PR PATCH] [Updated] " classabbyamp
@ 2022-04-04 16:36 ` classabbyamp
  2022-04-04 17:47 ` classabbyamp
                   ` (15 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: classabbyamp @ 2022-04-04 16:36 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1442 bytes --]

There is an updated pull request by classabbyamp against master on the void-packages repository

https://github.com/classabbyamp/void-packages openjdk11-cleanup
https://github.com/void-linux/void-packages/pull/36520

openjdk11: cleanup, split jre into subpackage
- openjdk11: clean up template
- New package: openjdk11-jre-11.0.12+5.

This should bring openjdk11 more in-line with other openjdk package templates

cc: @knusbaum for maintainer review

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/36520.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openjdk11-cleanup-36520.patch --]
[-- Type: text/x-diff, Size: 10705 bytes --]

From d54e1d4191420fb7e79f56c06efa1c23d6ec2cd5 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Mon, 4 Apr 2022 12:15:17 -0400
Subject: [PATCH 1/2] openjdk11: clean up template

---
 srcpkgs/openjdk11/template | 110 ++++++++++++++++++-------------------
 1 file changed, 55 insertions(+), 55 deletions(-)

diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index bd38c0c5c010..2c670d92ee1d 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -1,9 +1,9 @@
 # Template file for 'openjdk11'
 pkgname=openjdk11
 version=11.0.12+5
-revision=2
+revision=3
 _java_ver="${version%%.*}"
-_openjdk_version="openjdk-${_java_ver}"
+_jdk_home="usr/lib/jvm/openjdk${_java_ver}"
 wrksrc="jdk${_java_ver}u-jdk-${version}"
 build_style=gnu-configure
 configure_args="
@@ -68,50 +68,50 @@ if [ ! "$CROSS_BUILD" ]; then
 	configure_args+=" --with-boot-jdk=/usr/lib/jvm/java-10-openjdk"
 else
 	hostmakedepends+=" openjdk11"
-	configure_args+=" --with-boot-jdk=/usr/lib/jvm/openjdk11"
+	configure_args+=" --with-boot-jdk=/${_jdk_home}"
 fi
 
 alternatives="
- java:/usr/bin/java:/usr/lib/jvm/openjdk11/bin/java
- java:/usr/bin/jjs:/usr/lib/jvm/openjdk11/bin/jjs
- java:/usr/bin/keytool:/usr/lib/jvm/openjdk11/bin/keytool
- java:/usr/bin/pack200:/usr/lib/jvm/openjdk11/bin/pack200
- java:/usr/bin/rmid:/usr/lib/jvm/openjdk11/bin/rmid
- java:/usr/bin/rmiregistry:/usr/lib/jvm/openjdk11/bin/rmiregistry
- java:/usr/bin/unpack200:/usr/lib/jvm/openjdk11/bin/unpack200
+ java:/usr/bin/java:/${_jdk_home}/bin/java
+ java:/usr/bin/jjs:/${_jdk_home}/bin/jjs
+ java:/usr/bin/keytool:/${_jdk_home}/bin/keytool
+ java:/usr/bin/pack200:/${_jdk_home}/bin/pack200
+ java:/usr/bin/rmid:/${_jdk_home}/bin/rmid
+ java:/usr/bin/rmiregistry:/${_jdk_home}/bin/rmiregistry
+ java:/usr/bin/unpack200:/${_jdk_home}/bin/unpack200
 
- jdk:/usr/bin/jaotc:/usr/lib/jvm/openjdk11/bin/jaotc
- jdk:/usr/bin/jar:/usr/lib/jvm/openjdk11/bin/jar
- jdk:/usr/bin/jarsigner:/usr/lib/jvm/openjdk11/bin/jarsigner
- jdk:/usr/bin/java:/usr/lib/jvm/openjdk11/bin/java
- jdk:/usr/bin/javac:/usr/lib/jvm/openjdk11/bin/javac
- jdk:/usr/bin/javadoc:/usr/lib/jvm/openjdk11/bin/javadoc
- jdk:/usr/bin/javap:/usr/lib/jvm/openjdk11/bin/javap
- jdk:/usr/bin/jcmd:/usr/lib/jvm/openjdk11/bin/jcmd
- jdk:/usr/bin/jconsole:/usr/lib/jvm/openjdk11/bin/jconsole
- jdk:/usr/bin/jdb:/usr/lib/jvm/openjdk11/bin/jdb
- jdk:/usr/bin/jdeprscan:/usr/lib/jvm/openjdk11/bin/jdeprscan
- jdk:/usr/bin/jdeps:/usr/lib/jvm/openjdk11/bin/jdeps
- jdk:/usr/bin/jhsdb:/usr/lib/jvm/openjdk11/bin/jhsdb
- jdk:/usr/bin/jimage:/usr/lib/jvm/openjdk11/bin/jimage
- jdk:/usr/bin/jinfo:/usr/lib/jvm/openjdk11/bin/jinfo
- jdk:/usr/bin/jjs:/usr/lib/jvm/openjdk11/bin/jjs
- jdk:/usr/bin/jlink:/usr/lib/jvm/openjdk11/bin/jlink
- jdk:/usr/bin/jmap:/usr/lib/jvm/openjdk11/bin/jmap
- jdk:/usr/bin/jmod:/usr/lib/jvm/openjdk11/bin/jmod
- jdk:/usr/bin/jps:/usr/lib/jvm/openjdk11/bin/jps
- jdk:/usr/bin/jrunscript:/usr/lib/jvm/openjdk11/bin/jrunscript
- jdk:/usr/bin/jshell:/usr/lib/jvm/openjdk11/bin/jshell
- jdk:/usr/bin/jstack:/usr/lib/jvm/openjdk11/bin/jstack
- jdk:/usr/bin/jstat:/usr/lib/jvm/openjdk11/bin/jstat
- jdk:/usr/bin/jstatd:/usr/lib/jvm/openjdk11/bin/jstatd
- jdk:/usr/bin/keytool:/usr/lib/jvm/openjdk11/bin/keytool
- jdk:/usr/bin/pack200:/usr/lib/jvm/openjdk11/bin/pack200
- jdk:/usr/bin/rmic:/usr/lib/jvm/openjdk11/bin/rmic
- jdk:/usr/bin/rmid:/usr/lib/jvm/openjdk11/bin/rmid
- jdk:/usr/bin/rmiregistry:/usr/lib/jvm/openjdk11/bin/rmiregistry
- jdk:/usr/bin/serialver:/usr/lib/jvm/openjdk11/bin/serialver
- jdk:/usr/bin/unpack200:/usr/lib/jvm/openjdk11/bin/unpack200
+ jdk:/usr/bin/jaotc:/${_jdk_home}/bin/jaotc
+ jdk:/usr/bin/jar:/${_jdk_home}/bin/jar
+ jdk:/usr/bin/jarsigner:/${_jdk_home}/bin/jarsigner
+ jdk:/usr/bin/java:/${_jdk_home}/bin/java
+ jdk:/usr/bin/javac:/${_jdk_home}/bin/javac
+ jdk:/usr/bin/javadoc:/${_jdk_home}/bin/javadoc
+ jdk:/usr/bin/javap:/${_jdk_home}/bin/javap
+ jdk:/usr/bin/jcmd:/${_jdk_home}/bin/jcmd
+ jdk:/usr/bin/jconsole:/${_jdk_home}/bin/jconsole
+ jdk:/usr/bin/jdb:/${_jdk_home}/bin/jdb
+ jdk:/usr/bin/jdeprscan:/${_jdk_home}/bin/jdeprscan
+ jdk:/usr/bin/jdeps:/${_jdk_home}/bin/jdeps
+ jdk:/usr/bin/jhsdb:/${_jdk_home}/bin/jhsdb
+ jdk:/usr/bin/jimage:/${_jdk_home}/bin/jimage
+ jdk:/usr/bin/jinfo:/${_jdk_home}/bin/jinfo
+ jdk:/usr/bin/jjs:/${_jdk_home}/bin/jjs
+ jdk:/usr/bin/jlink:/${_jdk_home}/bin/jlink
+ jdk:/usr/bin/jmap:/${_jdk_home}/bin/jmap
+ jdk:/usr/bin/jmod:/${_jdk_home}/bin/jmod
+ jdk:/usr/bin/jps:/${_jdk_home}/bin/jps
+ jdk:/usr/bin/jrunscript:/${_jdk_home}/bin/jrunscript
+ jdk:/usr/bin/jshell:/${_jdk_home}/bin/jshell
+ jdk:/usr/bin/jstack:/${_jdk_home}/bin/jstack
+ jdk:/usr/bin/jstat:/${_jdk_home}/bin/jstat
+ jdk:/usr/bin/jstatd:/${_jdk_home}/bin/jstatd
+ jdk:/usr/bin/keytool:/${_jdk_home}/bin/keytool
+ jdk:/usr/bin/pack200:/${_jdk_home}/bin/pack200
+ jdk:/usr/bin/rmic:/${_jdk_home}/bin/rmic
+ jdk:/usr/bin/rmid:/${_jdk_home}/bin/rmid
+ jdk:/usr/bin/rmiregistry:/${_jdk_home}/bin/rmiregistry
+ jdk:/usr/bin/serialver:/${_jdk_home}/bin/serialver
+ jdk:/usr/bin/unpack200:/${_jdk_home}/bin/unpack200
 "
 
 post_extract() {
@@ -151,11 +151,11 @@ do_configure() {
 }
 
 do_install() {
-	vmkdir usr/lib/jvm/openjdk${_java_ver}
-	vcopy build/*-normal-*-release/images/jdk/* "usr/lib/jvm/openjdk${_java_ver}"
-	vmkdir usr/lib/jvm/$_openjdk_version/lib/security
-	make-ca -g -f --destdir "${PWD}/ca" -k "${DESTDIR}/usr/lib/jvm/openjdk${_java_ver}/bin/keytool"
-	mv ./ca/etc/pki/tls/java/cacerts ${DESTDIR}/usr/lib/jvm/openjdk${_java_ver}/lib/security/
+	vmkdir $_jdk_home
+	vcopy build/*-normal-*-release/images/jdk/* $_jdk_home
+	vmkdir $_jdk_home/lib/security
+	make-ca -g -f --destdir "${PWD}/ca" -k $DESTDIR/$_jdk_home/bin/keytool
+	mv ./ca/etc/pki/tls/java/cacerts $DESTDIR/$_jdk_home/lib/security/
 	chmod -R ugo+rw ./ca
 	rm -Rf ./ca
 	vmkdir etc/profile.d
@@ -170,14 +170,14 @@ openjdk11-doc_package() {
 	nostrip=yes
 	noverifyrdeps=yes
 	noshlibprovides=yes
-	short_desc+=" -- documentation"
+	short_desc+=" - documentation"
 	pkg_install() {
 		cd ${wrksrc}
 		if [ "$build_option_docs" ]; then
 			vmkdir usr/share/doc/openjdk11
-			cp -a build/linux-*/images/docs/* ${PKGDESTDIR}/usr/share/doc/openjdk11
+			cp -a build/linux-*/images/docs/* $PKGDESTDIR/usr/share/doc/openjdk11
 		fi
-		vmove usr/lib/jvm/openjdk11/man/man1
+		vmove $_jdk_home/man/man1
 	}
 }
 
@@ -185,17 +185,17 @@ openjdk11-src_package() {
 	nostrip=yes
 	noverifyrdeps=yes
 	noshlibprovides=yes
-	short_desc+=" -- sources"
+	short_desc+=" - sources"
 	pkg_install() {
-		vmove "usr/lib/jvm/openjdk11/lib/src.zip"
+		vmove $_jdk_home/lib/src.zip
 	}
 }
 
 openjdk11-static-libs_package() {
 	notstrip=yes
-	short_desc+=" -- static libs"
+	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}"
+		vmkdir $_jdk_home
+		vcopy build/*-normal-*-release/images/static-libs/lib $_jdk_home
 	}
 }

From 7b45eb36ce037e8fcd5ba25bf53d3a11e34cfc49 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Mon, 4 Apr 2022 12:25:32 -0400
Subject: [PATCH 2/2] New package: openjdk11-jre-11.0.12+5.

---
 common/shlibs              | 12 ++++++------
 srcpkgs/openjdk11-jre      |  1 +
 srcpkgs/openjdk11/template | 35 ++++++++++++++++++++++++++++++++---
 3 files changed, 39 insertions(+), 9 deletions(-)
 create mode 120000 srcpkgs/openjdk11-jre

diff --git a/common/shlibs b/common/shlibs
index 307cb13347fc..f77f30c048ea 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1809,12 +1809,12 @@ libawt_xawt.so openjdk8-jre-8u20_1
 libjava.so openjdk8-jre-8u20_1
 libjli.so openjdk8-jre-8u20_1
 libjvm.so openjdk8-jre-8u20_1
-libjawt.so openjdk11-11.0.5+10_1
-libawt.so openjdk11-11.0.5+10_1
-libawt_xawt.so openjdk11-11.0.5+10_1
-libjava.so openjdk11-11.0.5+10_1
-libjli.so openjdk11-11.0.5+10_1
-libjvm.so openjdk11-11.0.5+10_1
+libjawt.so openjdk11-jre-11.0.5+10_1
+libawt.so openjdk11-jre-11.0.5+10_1
+libawt_xawt.so openjdk11-jre-11.0.5+10_1
+libjava.so openjdk11-jre-11.0.5+10_1
+libjli.so openjdk11-jre-11.0.5+10_1
+libjvm.so openjdk11-jre-11.0.5+10_1
 libjawt.so openjdk7-bootstrap-7u221b02_1
 libawt.so openjdk7-bootstrap-7u221b02_1
 libawt_xawt.so openjdk7-bootstrap-7u221b02_1
diff --git a/srcpkgs/openjdk11-jre b/srcpkgs/openjdk11-jre
new file mode 120000
index 000000000000..8213494c49ed
--- /dev/null
+++ b/srcpkgs/openjdk11-jre
@@ -0,0 +1 @@
+openjdk11
\ No newline at end of file
diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index 2c670d92ee1d..803595de1570 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -31,15 +31,14 @@ hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
 makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
  fontconfig-devel zlib-devel lcms2-devel"
-depends="fontconfig"
+depends="${pkgname}-jre-${version}_${revision}"
 short_desc="OpenJDK Java Development Kit"
 maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="GPL-2.0-only WITH Classpath-exception-2.0"
 homepage="http://openjdk.java.net/"
 distfiles="https://hg.openjdk.java.net/jdk-updates/jdk${_java_ver}u/archive/jdk-${version}.tar.gz"
 checksum=ff0edaf800c76ae435840365a9205a5f7277a5a2fd3c79ad874522a15c213559
-provides="java-environment-${version}_1 java-runtime-${version}_1"
-shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so"
+provides="java-environment-${version}_1"
 
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes
@@ -166,6 +165,36 @@ EOF
 	vlicense LICENSE
 }
 
+subpackages="openjdk11-src openjdk11-jre openjdk11-doc openjdk11-static-libs"
+
+openjdk11-jre_package() {
+	shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so"
+	short_desc+=" - runtime components"
+	provides="java-runtime-${version}_1"
+	depends="fontconfig"
+	alternatives="
+	 java:/usr/bin/java:/${_jdk_home}/bin/java
+	 java:/usr/bin/jjs:/${_jdk_home}/bin/jjs
+	 java:/usr/bin/keytool:/${_jdk_home}/bin/keytool
+	 java:/usr/bin/pack200:/${_jdk_home}/bin/pack200
+	 java:/usr/bin/rmid:/${_jdk_home}/bin/rmid
+	 java:/usr/bin/rmiregistry:/${_jdk_home}/bin/rmiregistry
+	 java:/usr/bin/unpack200:/${_jdk_home}/bin/unpack200
+	"
+	pkg_install() {
+		for bf in java jjs keytool pack200 rmid rmiregistry unpack200; do
+			vmove $_jdk_home/bin/$bf
+		done
+
+		for f in lib legal conf release; do
+			vmove $_jdk_home/$f
+		done
+
+		vlicense ASSEMBLY_EXCEPTION
+		vlicense LICENSE
+	}
+}
+
 openjdk11-doc_package() {
 	nostrip=yes
 	noverifyrdeps=yes

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PR PATCH] [Updated] openjdk11: cleanup, split jre into subpackage
  2022-04-04 16:29 [PR PATCH] openjdk11: cleanup, split jre into subpackage classabbyamp
  2022-04-04 16:31 ` [PR PATCH] [Updated] " classabbyamp
  2022-04-04 16:36 ` classabbyamp
@ 2022-04-04 17:47 ` classabbyamp
  2022-04-04 19:58 ` classabbyamp
                   ` (14 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: classabbyamp @ 2022-04-04 17:47 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1442 bytes --]

There is an updated pull request by classabbyamp against master on the void-packages repository

https://github.com/classabbyamp/void-packages openjdk11-cleanup
https://github.com/void-linux/void-packages/pull/36520

openjdk11: cleanup, split jre into subpackage
- openjdk11: clean up template
- New package: openjdk11-jre-11.0.12+5.

This should bring openjdk11 more in-line with other openjdk package templates

cc: @knusbaum for maintainer review

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/36520.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openjdk11-cleanup-36520.patch --]
[-- Type: text/x-diff, Size: 11156 bytes --]

From 32008ca0214b5fa6e69dc1b60e0f503fba502a8c Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Mon, 4 Apr 2022 12:15:17 -0400
Subject: [PATCH 1/2] openjdk11: clean up template

---
 srcpkgs/openjdk11/template | 110 ++++++++++++++++++-------------------
 1 file changed, 55 insertions(+), 55 deletions(-)

diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index bd38c0c5c010..2c670d92ee1d 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -1,9 +1,9 @@
 # Template file for 'openjdk11'
 pkgname=openjdk11
 version=11.0.12+5
-revision=2
+revision=3
 _java_ver="${version%%.*}"
-_openjdk_version="openjdk-${_java_ver}"
+_jdk_home="usr/lib/jvm/openjdk${_java_ver}"
 wrksrc="jdk${_java_ver}u-jdk-${version}"
 build_style=gnu-configure
 configure_args="
@@ -68,50 +68,50 @@ if [ ! "$CROSS_BUILD" ]; then
 	configure_args+=" --with-boot-jdk=/usr/lib/jvm/java-10-openjdk"
 else
 	hostmakedepends+=" openjdk11"
-	configure_args+=" --with-boot-jdk=/usr/lib/jvm/openjdk11"
+	configure_args+=" --with-boot-jdk=/${_jdk_home}"
 fi
 
 alternatives="
- java:/usr/bin/java:/usr/lib/jvm/openjdk11/bin/java
- java:/usr/bin/jjs:/usr/lib/jvm/openjdk11/bin/jjs
- java:/usr/bin/keytool:/usr/lib/jvm/openjdk11/bin/keytool
- java:/usr/bin/pack200:/usr/lib/jvm/openjdk11/bin/pack200
- java:/usr/bin/rmid:/usr/lib/jvm/openjdk11/bin/rmid
- java:/usr/bin/rmiregistry:/usr/lib/jvm/openjdk11/bin/rmiregistry
- java:/usr/bin/unpack200:/usr/lib/jvm/openjdk11/bin/unpack200
+ java:/usr/bin/java:/${_jdk_home}/bin/java
+ java:/usr/bin/jjs:/${_jdk_home}/bin/jjs
+ java:/usr/bin/keytool:/${_jdk_home}/bin/keytool
+ java:/usr/bin/pack200:/${_jdk_home}/bin/pack200
+ java:/usr/bin/rmid:/${_jdk_home}/bin/rmid
+ java:/usr/bin/rmiregistry:/${_jdk_home}/bin/rmiregistry
+ java:/usr/bin/unpack200:/${_jdk_home}/bin/unpack200
 
- jdk:/usr/bin/jaotc:/usr/lib/jvm/openjdk11/bin/jaotc
- jdk:/usr/bin/jar:/usr/lib/jvm/openjdk11/bin/jar
- jdk:/usr/bin/jarsigner:/usr/lib/jvm/openjdk11/bin/jarsigner
- jdk:/usr/bin/java:/usr/lib/jvm/openjdk11/bin/java
- jdk:/usr/bin/javac:/usr/lib/jvm/openjdk11/bin/javac
- jdk:/usr/bin/javadoc:/usr/lib/jvm/openjdk11/bin/javadoc
- jdk:/usr/bin/javap:/usr/lib/jvm/openjdk11/bin/javap
- jdk:/usr/bin/jcmd:/usr/lib/jvm/openjdk11/bin/jcmd
- jdk:/usr/bin/jconsole:/usr/lib/jvm/openjdk11/bin/jconsole
- jdk:/usr/bin/jdb:/usr/lib/jvm/openjdk11/bin/jdb
- jdk:/usr/bin/jdeprscan:/usr/lib/jvm/openjdk11/bin/jdeprscan
- jdk:/usr/bin/jdeps:/usr/lib/jvm/openjdk11/bin/jdeps
- jdk:/usr/bin/jhsdb:/usr/lib/jvm/openjdk11/bin/jhsdb
- jdk:/usr/bin/jimage:/usr/lib/jvm/openjdk11/bin/jimage
- jdk:/usr/bin/jinfo:/usr/lib/jvm/openjdk11/bin/jinfo
- jdk:/usr/bin/jjs:/usr/lib/jvm/openjdk11/bin/jjs
- jdk:/usr/bin/jlink:/usr/lib/jvm/openjdk11/bin/jlink
- jdk:/usr/bin/jmap:/usr/lib/jvm/openjdk11/bin/jmap
- jdk:/usr/bin/jmod:/usr/lib/jvm/openjdk11/bin/jmod
- jdk:/usr/bin/jps:/usr/lib/jvm/openjdk11/bin/jps
- jdk:/usr/bin/jrunscript:/usr/lib/jvm/openjdk11/bin/jrunscript
- jdk:/usr/bin/jshell:/usr/lib/jvm/openjdk11/bin/jshell
- jdk:/usr/bin/jstack:/usr/lib/jvm/openjdk11/bin/jstack
- jdk:/usr/bin/jstat:/usr/lib/jvm/openjdk11/bin/jstat
- jdk:/usr/bin/jstatd:/usr/lib/jvm/openjdk11/bin/jstatd
- jdk:/usr/bin/keytool:/usr/lib/jvm/openjdk11/bin/keytool
- jdk:/usr/bin/pack200:/usr/lib/jvm/openjdk11/bin/pack200
- jdk:/usr/bin/rmic:/usr/lib/jvm/openjdk11/bin/rmic
- jdk:/usr/bin/rmid:/usr/lib/jvm/openjdk11/bin/rmid
- jdk:/usr/bin/rmiregistry:/usr/lib/jvm/openjdk11/bin/rmiregistry
- jdk:/usr/bin/serialver:/usr/lib/jvm/openjdk11/bin/serialver
- jdk:/usr/bin/unpack200:/usr/lib/jvm/openjdk11/bin/unpack200
+ jdk:/usr/bin/jaotc:/${_jdk_home}/bin/jaotc
+ jdk:/usr/bin/jar:/${_jdk_home}/bin/jar
+ jdk:/usr/bin/jarsigner:/${_jdk_home}/bin/jarsigner
+ jdk:/usr/bin/java:/${_jdk_home}/bin/java
+ jdk:/usr/bin/javac:/${_jdk_home}/bin/javac
+ jdk:/usr/bin/javadoc:/${_jdk_home}/bin/javadoc
+ jdk:/usr/bin/javap:/${_jdk_home}/bin/javap
+ jdk:/usr/bin/jcmd:/${_jdk_home}/bin/jcmd
+ jdk:/usr/bin/jconsole:/${_jdk_home}/bin/jconsole
+ jdk:/usr/bin/jdb:/${_jdk_home}/bin/jdb
+ jdk:/usr/bin/jdeprscan:/${_jdk_home}/bin/jdeprscan
+ jdk:/usr/bin/jdeps:/${_jdk_home}/bin/jdeps
+ jdk:/usr/bin/jhsdb:/${_jdk_home}/bin/jhsdb
+ jdk:/usr/bin/jimage:/${_jdk_home}/bin/jimage
+ jdk:/usr/bin/jinfo:/${_jdk_home}/bin/jinfo
+ jdk:/usr/bin/jjs:/${_jdk_home}/bin/jjs
+ jdk:/usr/bin/jlink:/${_jdk_home}/bin/jlink
+ jdk:/usr/bin/jmap:/${_jdk_home}/bin/jmap
+ jdk:/usr/bin/jmod:/${_jdk_home}/bin/jmod
+ jdk:/usr/bin/jps:/${_jdk_home}/bin/jps
+ jdk:/usr/bin/jrunscript:/${_jdk_home}/bin/jrunscript
+ jdk:/usr/bin/jshell:/${_jdk_home}/bin/jshell
+ jdk:/usr/bin/jstack:/${_jdk_home}/bin/jstack
+ jdk:/usr/bin/jstat:/${_jdk_home}/bin/jstat
+ jdk:/usr/bin/jstatd:/${_jdk_home}/bin/jstatd
+ jdk:/usr/bin/keytool:/${_jdk_home}/bin/keytool
+ jdk:/usr/bin/pack200:/${_jdk_home}/bin/pack200
+ jdk:/usr/bin/rmic:/${_jdk_home}/bin/rmic
+ jdk:/usr/bin/rmid:/${_jdk_home}/bin/rmid
+ jdk:/usr/bin/rmiregistry:/${_jdk_home}/bin/rmiregistry
+ jdk:/usr/bin/serialver:/${_jdk_home}/bin/serialver
+ jdk:/usr/bin/unpack200:/${_jdk_home}/bin/unpack200
 "
 
 post_extract() {
@@ -151,11 +151,11 @@ do_configure() {
 }
 
 do_install() {
-	vmkdir usr/lib/jvm/openjdk${_java_ver}
-	vcopy build/*-normal-*-release/images/jdk/* "usr/lib/jvm/openjdk${_java_ver}"
-	vmkdir usr/lib/jvm/$_openjdk_version/lib/security
-	make-ca -g -f --destdir "${PWD}/ca" -k "${DESTDIR}/usr/lib/jvm/openjdk${_java_ver}/bin/keytool"
-	mv ./ca/etc/pki/tls/java/cacerts ${DESTDIR}/usr/lib/jvm/openjdk${_java_ver}/lib/security/
+	vmkdir $_jdk_home
+	vcopy build/*-normal-*-release/images/jdk/* $_jdk_home
+	vmkdir $_jdk_home/lib/security
+	make-ca -g -f --destdir "${PWD}/ca" -k $DESTDIR/$_jdk_home/bin/keytool
+	mv ./ca/etc/pki/tls/java/cacerts $DESTDIR/$_jdk_home/lib/security/
 	chmod -R ugo+rw ./ca
 	rm -Rf ./ca
 	vmkdir etc/profile.d
@@ -170,14 +170,14 @@ openjdk11-doc_package() {
 	nostrip=yes
 	noverifyrdeps=yes
 	noshlibprovides=yes
-	short_desc+=" -- documentation"
+	short_desc+=" - documentation"
 	pkg_install() {
 		cd ${wrksrc}
 		if [ "$build_option_docs" ]; then
 			vmkdir usr/share/doc/openjdk11
-			cp -a build/linux-*/images/docs/* ${PKGDESTDIR}/usr/share/doc/openjdk11
+			cp -a build/linux-*/images/docs/* $PKGDESTDIR/usr/share/doc/openjdk11
 		fi
-		vmove usr/lib/jvm/openjdk11/man/man1
+		vmove $_jdk_home/man/man1
 	}
 }
 
@@ -185,17 +185,17 @@ openjdk11-src_package() {
 	nostrip=yes
 	noverifyrdeps=yes
 	noshlibprovides=yes
-	short_desc+=" -- sources"
+	short_desc+=" - sources"
 	pkg_install() {
-		vmove "usr/lib/jvm/openjdk11/lib/src.zip"
+		vmove $_jdk_home/lib/src.zip
 	}
 }
 
 openjdk11-static-libs_package() {
 	notstrip=yes
-	short_desc+=" -- static libs"
+	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}"
+		vmkdir $_jdk_home
+		vcopy build/*-normal-*-release/images/static-libs/lib $_jdk_home
 	}
 }

From acef618bf176d3d58d1669086909da3cbbc92ab9 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Mon, 4 Apr 2022 12:25:32 -0400
Subject: [PATCH 2/2] New package: openjdk11-jre-11.0.12+5.

---
 common/shlibs              | 12 +++++------
 srcpkgs/openjdk11-jre      |  1 +
 srcpkgs/openjdk11/template | 44 ++++++++++++++++++++++++++++++++------
 3 files changed, 44 insertions(+), 13 deletions(-)
 create mode 120000 srcpkgs/openjdk11-jre

diff --git a/common/shlibs b/common/shlibs
index 307cb13347fc..f77f30c048ea 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1809,12 +1809,12 @@ libawt_xawt.so openjdk8-jre-8u20_1
 libjava.so openjdk8-jre-8u20_1
 libjli.so openjdk8-jre-8u20_1
 libjvm.so openjdk8-jre-8u20_1
-libjawt.so openjdk11-11.0.5+10_1
-libawt.so openjdk11-11.0.5+10_1
-libawt_xawt.so openjdk11-11.0.5+10_1
-libjava.so openjdk11-11.0.5+10_1
-libjli.so openjdk11-11.0.5+10_1
-libjvm.so openjdk11-11.0.5+10_1
+libjawt.so openjdk11-jre-11.0.5+10_1
+libawt.so openjdk11-jre-11.0.5+10_1
+libawt_xawt.so openjdk11-jre-11.0.5+10_1
+libjava.so openjdk11-jre-11.0.5+10_1
+libjli.so openjdk11-jre-11.0.5+10_1
+libjvm.so openjdk11-jre-11.0.5+10_1
 libjawt.so openjdk7-bootstrap-7u221b02_1
 libawt.so openjdk7-bootstrap-7u221b02_1
 libawt_xawt.so openjdk7-bootstrap-7u221b02_1
diff --git a/srcpkgs/openjdk11-jre b/srcpkgs/openjdk11-jre
new file mode 120000
index 000000000000..8213494c49ed
--- /dev/null
+++ b/srcpkgs/openjdk11-jre
@@ -0,0 +1 @@
+openjdk11
\ No newline at end of file
diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index 2c670d92ee1d..bae8704b6ce9 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -31,15 +31,14 @@ hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
 makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
  fontconfig-devel zlib-devel lcms2-devel"
-depends="fontconfig"
+depends="${pkgname}-jre-${version}_${revision}"
 short_desc="OpenJDK Java Development Kit"
 maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="GPL-2.0-only WITH Classpath-exception-2.0"
 homepage="http://openjdk.java.net/"
 distfiles="https://hg.openjdk.java.net/jdk-updates/jdk${_java_ver}u/archive/jdk-${version}.tar.gz"
 checksum=ff0edaf800c76ae435840365a9205a5f7277a5a2fd3c79ad874522a15c213559
-provides="java-environment-${version}_1 java-runtime-${version}_1"
-shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so"
+provides="java-environment-${version}_1"
 
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes
@@ -158,14 +157,45 @@ do_install() {
 	mv ./ca/etc/pki/tls/java/cacerts $DESTDIR/$_jdk_home/lib/security/
 	chmod -R ugo+rw ./ca
 	rm -Rf ./ca
-	vmkdir etc/profile.d
-	cat >>${DESTDIR}/etc/profile.d/10_openjdk11.sh <<EOF
-export JAVA_HOME=\${JAVA_HOME=/usr/lib/jvm/openjdk${_java_ver}}
-EOF
 	vlicense ASSEMBLY_EXCEPTION
 	vlicense LICENSE
 }
 
+subpackages="openjdk11-src openjdk11-jre openjdk11-doc openjdk11-static-libs"
+
+openjdk11-jre_package() {
+	shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so"
+	short_desc+=" - runtime components"
+	provides="java-runtime-${version}_1"
+	depends="fontconfig"
+	alternatives="
+	 java:/usr/bin/java:/${_jdk_home}/bin/java
+	 java:/usr/bin/jjs:/${_jdk_home}/bin/jjs
+	 java:/usr/bin/keytool:/${_jdk_home}/bin/keytool
+	 java:/usr/bin/pack200:/${_jdk_home}/bin/pack200
+	 java:/usr/bin/rmid:/${_jdk_home}/bin/rmid
+	 java:/usr/bin/rmiregistry:/${_jdk_home}/bin/rmiregistry
+	 java:/usr/bin/unpack200:/${_jdk_home}/bin/unpack200
+	"
+	pkg_install() {
+		for bf in java jjs keytool pack200 rmid rmiregistry unpack200; do
+			vmove $_jdk_home/bin/$bf
+		done
+
+		for f in lib legal conf release; do
+			vmove $_jdk_home/$f
+		done
+
+		vmkdir etc/profile.d
+		cat >>${DESTDIR}/etc/profile.d/10_openjdk11.sh <<EOF
+export JAVA_HOME=\${JAVA_HOME=/usr/lib/jvm/openjdk${_java_ver}}
+EOF
+
+		vlicense ASSEMBLY_EXCEPTION
+		vlicense LICENSE
+	}
+}
+
 openjdk11-doc_package() {
 	nostrip=yes
 	noverifyrdeps=yes

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PR PATCH] [Updated] openjdk11: cleanup, split jre into subpackage
  2022-04-04 16:29 [PR PATCH] openjdk11: cleanup, split jre into subpackage classabbyamp
                   ` (2 preceding siblings ...)
  2022-04-04 17:47 ` classabbyamp
@ 2022-04-04 19:58 ` classabbyamp
  2022-04-04 21:04 ` classabbyamp
                   ` (13 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: classabbyamp @ 2022-04-04 19:58 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1442 bytes --]

There is an updated pull request by classabbyamp against master on the void-packages repository

https://github.com/classabbyamp/void-packages openjdk11-cleanup
https://github.com/void-linux/void-packages/pull/36520

openjdk11: cleanup, split jre into subpackage
- openjdk11: clean up template
- New package: openjdk11-jre-11.0.12+5.

This should bring openjdk11 more in-line with other openjdk package templates

cc: @knusbaum for maintainer review

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/36520.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openjdk11-cleanup-36520.patch --]
[-- Type: text/x-diff, Size: 11159 bytes --]

From 32008ca0214b5fa6e69dc1b60e0f503fba502a8c Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Mon, 4 Apr 2022 12:15:17 -0400
Subject: [PATCH 1/2] openjdk11: clean up template

---
 srcpkgs/openjdk11/template | 110 ++++++++++++++++++-------------------
 1 file changed, 55 insertions(+), 55 deletions(-)

diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index bd38c0c5c010..2c670d92ee1d 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -1,9 +1,9 @@
 # Template file for 'openjdk11'
 pkgname=openjdk11
 version=11.0.12+5
-revision=2
+revision=3
 _java_ver="${version%%.*}"
-_openjdk_version="openjdk-${_java_ver}"
+_jdk_home="usr/lib/jvm/openjdk${_java_ver}"
 wrksrc="jdk${_java_ver}u-jdk-${version}"
 build_style=gnu-configure
 configure_args="
@@ -68,50 +68,50 @@ if [ ! "$CROSS_BUILD" ]; then
 	configure_args+=" --with-boot-jdk=/usr/lib/jvm/java-10-openjdk"
 else
 	hostmakedepends+=" openjdk11"
-	configure_args+=" --with-boot-jdk=/usr/lib/jvm/openjdk11"
+	configure_args+=" --with-boot-jdk=/${_jdk_home}"
 fi
 
 alternatives="
- java:/usr/bin/java:/usr/lib/jvm/openjdk11/bin/java
- java:/usr/bin/jjs:/usr/lib/jvm/openjdk11/bin/jjs
- java:/usr/bin/keytool:/usr/lib/jvm/openjdk11/bin/keytool
- java:/usr/bin/pack200:/usr/lib/jvm/openjdk11/bin/pack200
- java:/usr/bin/rmid:/usr/lib/jvm/openjdk11/bin/rmid
- java:/usr/bin/rmiregistry:/usr/lib/jvm/openjdk11/bin/rmiregistry
- java:/usr/bin/unpack200:/usr/lib/jvm/openjdk11/bin/unpack200
+ java:/usr/bin/java:/${_jdk_home}/bin/java
+ java:/usr/bin/jjs:/${_jdk_home}/bin/jjs
+ java:/usr/bin/keytool:/${_jdk_home}/bin/keytool
+ java:/usr/bin/pack200:/${_jdk_home}/bin/pack200
+ java:/usr/bin/rmid:/${_jdk_home}/bin/rmid
+ java:/usr/bin/rmiregistry:/${_jdk_home}/bin/rmiregistry
+ java:/usr/bin/unpack200:/${_jdk_home}/bin/unpack200
 
- jdk:/usr/bin/jaotc:/usr/lib/jvm/openjdk11/bin/jaotc
- jdk:/usr/bin/jar:/usr/lib/jvm/openjdk11/bin/jar
- jdk:/usr/bin/jarsigner:/usr/lib/jvm/openjdk11/bin/jarsigner
- jdk:/usr/bin/java:/usr/lib/jvm/openjdk11/bin/java
- jdk:/usr/bin/javac:/usr/lib/jvm/openjdk11/bin/javac
- jdk:/usr/bin/javadoc:/usr/lib/jvm/openjdk11/bin/javadoc
- jdk:/usr/bin/javap:/usr/lib/jvm/openjdk11/bin/javap
- jdk:/usr/bin/jcmd:/usr/lib/jvm/openjdk11/bin/jcmd
- jdk:/usr/bin/jconsole:/usr/lib/jvm/openjdk11/bin/jconsole
- jdk:/usr/bin/jdb:/usr/lib/jvm/openjdk11/bin/jdb
- jdk:/usr/bin/jdeprscan:/usr/lib/jvm/openjdk11/bin/jdeprscan
- jdk:/usr/bin/jdeps:/usr/lib/jvm/openjdk11/bin/jdeps
- jdk:/usr/bin/jhsdb:/usr/lib/jvm/openjdk11/bin/jhsdb
- jdk:/usr/bin/jimage:/usr/lib/jvm/openjdk11/bin/jimage
- jdk:/usr/bin/jinfo:/usr/lib/jvm/openjdk11/bin/jinfo
- jdk:/usr/bin/jjs:/usr/lib/jvm/openjdk11/bin/jjs
- jdk:/usr/bin/jlink:/usr/lib/jvm/openjdk11/bin/jlink
- jdk:/usr/bin/jmap:/usr/lib/jvm/openjdk11/bin/jmap
- jdk:/usr/bin/jmod:/usr/lib/jvm/openjdk11/bin/jmod
- jdk:/usr/bin/jps:/usr/lib/jvm/openjdk11/bin/jps
- jdk:/usr/bin/jrunscript:/usr/lib/jvm/openjdk11/bin/jrunscript
- jdk:/usr/bin/jshell:/usr/lib/jvm/openjdk11/bin/jshell
- jdk:/usr/bin/jstack:/usr/lib/jvm/openjdk11/bin/jstack
- jdk:/usr/bin/jstat:/usr/lib/jvm/openjdk11/bin/jstat
- jdk:/usr/bin/jstatd:/usr/lib/jvm/openjdk11/bin/jstatd
- jdk:/usr/bin/keytool:/usr/lib/jvm/openjdk11/bin/keytool
- jdk:/usr/bin/pack200:/usr/lib/jvm/openjdk11/bin/pack200
- jdk:/usr/bin/rmic:/usr/lib/jvm/openjdk11/bin/rmic
- jdk:/usr/bin/rmid:/usr/lib/jvm/openjdk11/bin/rmid
- jdk:/usr/bin/rmiregistry:/usr/lib/jvm/openjdk11/bin/rmiregistry
- jdk:/usr/bin/serialver:/usr/lib/jvm/openjdk11/bin/serialver
- jdk:/usr/bin/unpack200:/usr/lib/jvm/openjdk11/bin/unpack200
+ jdk:/usr/bin/jaotc:/${_jdk_home}/bin/jaotc
+ jdk:/usr/bin/jar:/${_jdk_home}/bin/jar
+ jdk:/usr/bin/jarsigner:/${_jdk_home}/bin/jarsigner
+ jdk:/usr/bin/java:/${_jdk_home}/bin/java
+ jdk:/usr/bin/javac:/${_jdk_home}/bin/javac
+ jdk:/usr/bin/javadoc:/${_jdk_home}/bin/javadoc
+ jdk:/usr/bin/javap:/${_jdk_home}/bin/javap
+ jdk:/usr/bin/jcmd:/${_jdk_home}/bin/jcmd
+ jdk:/usr/bin/jconsole:/${_jdk_home}/bin/jconsole
+ jdk:/usr/bin/jdb:/${_jdk_home}/bin/jdb
+ jdk:/usr/bin/jdeprscan:/${_jdk_home}/bin/jdeprscan
+ jdk:/usr/bin/jdeps:/${_jdk_home}/bin/jdeps
+ jdk:/usr/bin/jhsdb:/${_jdk_home}/bin/jhsdb
+ jdk:/usr/bin/jimage:/${_jdk_home}/bin/jimage
+ jdk:/usr/bin/jinfo:/${_jdk_home}/bin/jinfo
+ jdk:/usr/bin/jjs:/${_jdk_home}/bin/jjs
+ jdk:/usr/bin/jlink:/${_jdk_home}/bin/jlink
+ jdk:/usr/bin/jmap:/${_jdk_home}/bin/jmap
+ jdk:/usr/bin/jmod:/${_jdk_home}/bin/jmod
+ jdk:/usr/bin/jps:/${_jdk_home}/bin/jps
+ jdk:/usr/bin/jrunscript:/${_jdk_home}/bin/jrunscript
+ jdk:/usr/bin/jshell:/${_jdk_home}/bin/jshell
+ jdk:/usr/bin/jstack:/${_jdk_home}/bin/jstack
+ jdk:/usr/bin/jstat:/${_jdk_home}/bin/jstat
+ jdk:/usr/bin/jstatd:/${_jdk_home}/bin/jstatd
+ jdk:/usr/bin/keytool:/${_jdk_home}/bin/keytool
+ jdk:/usr/bin/pack200:/${_jdk_home}/bin/pack200
+ jdk:/usr/bin/rmic:/${_jdk_home}/bin/rmic
+ jdk:/usr/bin/rmid:/${_jdk_home}/bin/rmid
+ jdk:/usr/bin/rmiregistry:/${_jdk_home}/bin/rmiregistry
+ jdk:/usr/bin/serialver:/${_jdk_home}/bin/serialver
+ jdk:/usr/bin/unpack200:/${_jdk_home}/bin/unpack200
 "
 
 post_extract() {
@@ -151,11 +151,11 @@ do_configure() {
 }
 
 do_install() {
-	vmkdir usr/lib/jvm/openjdk${_java_ver}
-	vcopy build/*-normal-*-release/images/jdk/* "usr/lib/jvm/openjdk${_java_ver}"
-	vmkdir usr/lib/jvm/$_openjdk_version/lib/security
-	make-ca -g -f --destdir "${PWD}/ca" -k "${DESTDIR}/usr/lib/jvm/openjdk${_java_ver}/bin/keytool"
-	mv ./ca/etc/pki/tls/java/cacerts ${DESTDIR}/usr/lib/jvm/openjdk${_java_ver}/lib/security/
+	vmkdir $_jdk_home
+	vcopy build/*-normal-*-release/images/jdk/* $_jdk_home
+	vmkdir $_jdk_home/lib/security
+	make-ca -g -f --destdir "${PWD}/ca" -k $DESTDIR/$_jdk_home/bin/keytool
+	mv ./ca/etc/pki/tls/java/cacerts $DESTDIR/$_jdk_home/lib/security/
 	chmod -R ugo+rw ./ca
 	rm -Rf ./ca
 	vmkdir etc/profile.d
@@ -170,14 +170,14 @@ openjdk11-doc_package() {
 	nostrip=yes
 	noverifyrdeps=yes
 	noshlibprovides=yes
-	short_desc+=" -- documentation"
+	short_desc+=" - documentation"
 	pkg_install() {
 		cd ${wrksrc}
 		if [ "$build_option_docs" ]; then
 			vmkdir usr/share/doc/openjdk11
-			cp -a build/linux-*/images/docs/* ${PKGDESTDIR}/usr/share/doc/openjdk11
+			cp -a build/linux-*/images/docs/* $PKGDESTDIR/usr/share/doc/openjdk11
 		fi
-		vmove usr/lib/jvm/openjdk11/man/man1
+		vmove $_jdk_home/man/man1
 	}
 }
 
@@ -185,17 +185,17 @@ openjdk11-src_package() {
 	nostrip=yes
 	noverifyrdeps=yes
 	noshlibprovides=yes
-	short_desc+=" -- sources"
+	short_desc+=" - sources"
 	pkg_install() {
-		vmove "usr/lib/jvm/openjdk11/lib/src.zip"
+		vmove $_jdk_home/lib/src.zip
 	}
 }
 
 openjdk11-static-libs_package() {
 	notstrip=yes
-	short_desc+=" -- static libs"
+	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}"
+		vmkdir $_jdk_home
+		vcopy build/*-normal-*-release/images/static-libs/lib $_jdk_home
 	}
 }

From 3b05be74a46a5621b26bd30dee6bfdc1d6750664 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Mon, 4 Apr 2022 12:25:32 -0400
Subject: [PATCH 2/2] New package: openjdk11-jre-11.0.12+5.

---
 common/shlibs              | 12 +++++------
 srcpkgs/openjdk11-jre      |  1 +
 srcpkgs/openjdk11/template | 44 ++++++++++++++++++++++++++++++++------
 3 files changed, 44 insertions(+), 13 deletions(-)
 create mode 120000 srcpkgs/openjdk11-jre

diff --git a/common/shlibs b/common/shlibs
index 307cb13347fc..f77f30c048ea 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1809,12 +1809,12 @@ libawt_xawt.so openjdk8-jre-8u20_1
 libjava.so openjdk8-jre-8u20_1
 libjli.so openjdk8-jre-8u20_1
 libjvm.so openjdk8-jre-8u20_1
-libjawt.so openjdk11-11.0.5+10_1
-libawt.so openjdk11-11.0.5+10_1
-libawt_xawt.so openjdk11-11.0.5+10_1
-libjava.so openjdk11-11.0.5+10_1
-libjli.so openjdk11-11.0.5+10_1
-libjvm.so openjdk11-11.0.5+10_1
+libjawt.so openjdk11-jre-11.0.5+10_1
+libawt.so openjdk11-jre-11.0.5+10_1
+libawt_xawt.so openjdk11-jre-11.0.5+10_1
+libjava.so openjdk11-jre-11.0.5+10_1
+libjli.so openjdk11-jre-11.0.5+10_1
+libjvm.so openjdk11-jre-11.0.5+10_1
 libjawt.so openjdk7-bootstrap-7u221b02_1
 libawt.so openjdk7-bootstrap-7u221b02_1
 libawt_xawt.so openjdk7-bootstrap-7u221b02_1
diff --git a/srcpkgs/openjdk11-jre b/srcpkgs/openjdk11-jre
new file mode 120000
index 000000000000..8213494c49ed
--- /dev/null
+++ b/srcpkgs/openjdk11-jre
@@ -0,0 +1 @@
+openjdk11
\ No newline at end of file
diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index 2c670d92ee1d..a2cc31c85aea 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -31,15 +31,14 @@ hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
 makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
  fontconfig-devel zlib-devel lcms2-devel"
-depends="fontconfig"
+depends="${pkgname}-jre-${version}_${revision}"
 short_desc="OpenJDK Java Development Kit"
 maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="GPL-2.0-only WITH Classpath-exception-2.0"
 homepage="http://openjdk.java.net/"
 distfiles="https://hg.openjdk.java.net/jdk-updates/jdk${_java_ver}u/archive/jdk-${version}.tar.gz"
 checksum=ff0edaf800c76ae435840365a9205a5f7277a5a2fd3c79ad874522a15c213559
-provides="java-environment-${version}_1 java-runtime-${version}_1"
-shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so"
+provides="java-environment-${version}_1"
 
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes
@@ -158,14 +157,45 @@ do_install() {
 	mv ./ca/etc/pki/tls/java/cacerts $DESTDIR/$_jdk_home/lib/security/
 	chmod -R ugo+rw ./ca
 	rm -Rf ./ca
-	vmkdir etc/profile.d
-	cat >>${DESTDIR}/etc/profile.d/10_openjdk11.sh <<EOF
-export JAVA_HOME=\${JAVA_HOME=/usr/lib/jvm/openjdk${_java_ver}}
-EOF
 	vlicense ASSEMBLY_EXCEPTION
 	vlicense LICENSE
 }
 
+subpackages="openjdk11-src openjdk11-jre openjdk11-doc openjdk11-static-libs"
+
+openjdk11-jre_package() {
+	shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so"
+	short_desc+=" - runtime components"
+	provides="java-runtime-${version}_1"
+	depends="fontconfig"
+	alternatives="
+	 java:/usr/bin/java:/${_jdk_home}/bin/java
+	 java:/usr/bin/jjs:/${_jdk_home}/bin/jjs
+	 java:/usr/bin/keytool:/${_jdk_home}/bin/keytool
+	 java:/usr/bin/pack200:/${_jdk_home}/bin/pack200
+	 java:/usr/bin/rmid:/${_jdk_home}/bin/rmid
+	 java:/usr/bin/rmiregistry:/${_jdk_home}/bin/rmiregistry
+	 java:/usr/bin/unpack200:/${_jdk_home}/bin/unpack200
+	"
+	pkg_install() {
+		for bf in java jjs keytool pack200 rmid rmiregistry unpack200; do
+			vmove $_jdk_home/bin/$bf
+		done
+
+		for f in lib legal conf release; do
+			vmove $_jdk_home/$f
+		done
+
+		vmkdir etc/profile.d
+		cat >>${PKGDESTDIR}/etc/profile.d/10_openjdk11.sh <<EOF
+export JAVA_HOME=\${JAVA_HOME=/usr/lib/jvm/openjdk${_java_ver}}
+EOF
+
+		vlicense ASSEMBLY_EXCEPTION
+		vlicense LICENSE
+	}
+}
+
 openjdk11-doc_package() {
 	nostrip=yes
 	noverifyrdeps=yes

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PR PATCH] [Updated] openjdk11: cleanup, split jre into subpackage
  2022-04-04 16:29 [PR PATCH] openjdk11: cleanup, split jre into subpackage classabbyamp
                   ` (3 preceding siblings ...)
  2022-04-04 19:58 ` classabbyamp
@ 2022-04-04 21:04 ` classabbyamp
  2022-04-19 15:30 ` classabbyamp
                   ` (12 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: classabbyamp @ 2022-04-04 21:04 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1442 bytes --]

There is an updated pull request by classabbyamp against master on the void-packages repository

https://github.com/classabbyamp/void-packages openjdk11-cleanup
https://github.com/void-linux/void-packages/pull/36520

openjdk11: cleanup, split jre into subpackage
- openjdk11: clean up template
- New package: openjdk11-jre-11.0.12+5.

This should bring openjdk11 more in-line with other openjdk package templates

cc: @knusbaum for maintainer review

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/36520.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openjdk11-cleanup-36520.patch --]
[-- Type: text/x-diff, Size: 11159 bytes --]

From 32008ca0214b5fa6e69dc1b60e0f503fba502a8c Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Mon, 4 Apr 2022 12:15:17 -0400
Subject: [PATCH 1/2] openjdk11: clean up template

---
 srcpkgs/openjdk11/template | 110 ++++++++++++++++++-------------------
 1 file changed, 55 insertions(+), 55 deletions(-)

diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index bd38c0c5c010..2c670d92ee1d 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -1,9 +1,9 @@
 # Template file for 'openjdk11'
 pkgname=openjdk11
 version=11.0.12+5
-revision=2
+revision=3
 _java_ver="${version%%.*}"
-_openjdk_version="openjdk-${_java_ver}"
+_jdk_home="usr/lib/jvm/openjdk${_java_ver}"
 wrksrc="jdk${_java_ver}u-jdk-${version}"
 build_style=gnu-configure
 configure_args="
@@ -68,50 +68,50 @@ if [ ! "$CROSS_BUILD" ]; then
 	configure_args+=" --with-boot-jdk=/usr/lib/jvm/java-10-openjdk"
 else
 	hostmakedepends+=" openjdk11"
-	configure_args+=" --with-boot-jdk=/usr/lib/jvm/openjdk11"
+	configure_args+=" --with-boot-jdk=/${_jdk_home}"
 fi
 
 alternatives="
- java:/usr/bin/java:/usr/lib/jvm/openjdk11/bin/java
- java:/usr/bin/jjs:/usr/lib/jvm/openjdk11/bin/jjs
- java:/usr/bin/keytool:/usr/lib/jvm/openjdk11/bin/keytool
- java:/usr/bin/pack200:/usr/lib/jvm/openjdk11/bin/pack200
- java:/usr/bin/rmid:/usr/lib/jvm/openjdk11/bin/rmid
- java:/usr/bin/rmiregistry:/usr/lib/jvm/openjdk11/bin/rmiregistry
- java:/usr/bin/unpack200:/usr/lib/jvm/openjdk11/bin/unpack200
+ java:/usr/bin/java:/${_jdk_home}/bin/java
+ java:/usr/bin/jjs:/${_jdk_home}/bin/jjs
+ java:/usr/bin/keytool:/${_jdk_home}/bin/keytool
+ java:/usr/bin/pack200:/${_jdk_home}/bin/pack200
+ java:/usr/bin/rmid:/${_jdk_home}/bin/rmid
+ java:/usr/bin/rmiregistry:/${_jdk_home}/bin/rmiregistry
+ java:/usr/bin/unpack200:/${_jdk_home}/bin/unpack200
 
- jdk:/usr/bin/jaotc:/usr/lib/jvm/openjdk11/bin/jaotc
- jdk:/usr/bin/jar:/usr/lib/jvm/openjdk11/bin/jar
- jdk:/usr/bin/jarsigner:/usr/lib/jvm/openjdk11/bin/jarsigner
- jdk:/usr/bin/java:/usr/lib/jvm/openjdk11/bin/java
- jdk:/usr/bin/javac:/usr/lib/jvm/openjdk11/bin/javac
- jdk:/usr/bin/javadoc:/usr/lib/jvm/openjdk11/bin/javadoc
- jdk:/usr/bin/javap:/usr/lib/jvm/openjdk11/bin/javap
- jdk:/usr/bin/jcmd:/usr/lib/jvm/openjdk11/bin/jcmd
- jdk:/usr/bin/jconsole:/usr/lib/jvm/openjdk11/bin/jconsole
- jdk:/usr/bin/jdb:/usr/lib/jvm/openjdk11/bin/jdb
- jdk:/usr/bin/jdeprscan:/usr/lib/jvm/openjdk11/bin/jdeprscan
- jdk:/usr/bin/jdeps:/usr/lib/jvm/openjdk11/bin/jdeps
- jdk:/usr/bin/jhsdb:/usr/lib/jvm/openjdk11/bin/jhsdb
- jdk:/usr/bin/jimage:/usr/lib/jvm/openjdk11/bin/jimage
- jdk:/usr/bin/jinfo:/usr/lib/jvm/openjdk11/bin/jinfo
- jdk:/usr/bin/jjs:/usr/lib/jvm/openjdk11/bin/jjs
- jdk:/usr/bin/jlink:/usr/lib/jvm/openjdk11/bin/jlink
- jdk:/usr/bin/jmap:/usr/lib/jvm/openjdk11/bin/jmap
- jdk:/usr/bin/jmod:/usr/lib/jvm/openjdk11/bin/jmod
- jdk:/usr/bin/jps:/usr/lib/jvm/openjdk11/bin/jps
- jdk:/usr/bin/jrunscript:/usr/lib/jvm/openjdk11/bin/jrunscript
- jdk:/usr/bin/jshell:/usr/lib/jvm/openjdk11/bin/jshell
- jdk:/usr/bin/jstack:/usr/lib/jvm/openjdk11/bin/jstack
- jdk:/usr/bin/jstat:/usr/lib/jvm/openjdk11/bin/jstat
- jdk:/usr/bin/jstatd:/usr/lib/jvm/openjdk11/bin/jstatd
- jdk:/usr/bin/keytool:/usr/lib/jvm/openjdk11/bin/keytool
- jdk:/usr/bin/pack200:/usr/lib/jvm/openjdk11/bin/pack200
- jdk:/usr/bin/rmic:/usr/lib/jvm/openjdk11/bin/rmic
- jdk:/usr/bin/rmid:/usr/lib/jvm/openjdk11/bin/rmid
- jdk:/usr/bin/rmiregistry:/usr/lib/jvm/openjdk11/bin/rmiregistry
- jdk:/usr/bin/serialver:/usr/lib/jvm/openjdk11/bin/serialver
- jdk:/usr/bin/unpack200:/usr/lib/jvm/openjdk11/bin/unpack200
+ jdk:/usr/bin/jaotc:/${_jdk_home}/bin/jaotc
+ jdk:/usr/bin/jar:/${_jdk_home}/bin/jar
+ jdk:/usr/bin/jarsigner:/${_jdk_home}/bin/jarsigner
+ jdk:/usr/bin/java:/${_jdk_home}/bin/java
+ jdk:/usr/bin/javac:/${_jdk_home}/bin/javac
+ jdk:/usr/bin/javadoc:/${_jdk_home}/bin/javadoc
+ jdk:/usr/bin/javap:/${_jdk_home}/bin/javap
+ jdk:/usr/bin/jcmd:/${_jdk_home}/bin/jcmd
+ jdk:/usr/bin/jconsole:/${_jdk_home}/bin/jconsole
+ jdk:/usr/bin/jdb:/${_jdk_home}/bin/jdb
+ jdk:/usr/bin/jdeprscan:/${_jdk_home}/bin/jdeprscan
+ jdk:/usr/bin/jdeps:/${_jdk_home}/bin/jdeps
+ jdk:/usr/bin/jhsdb:/${_jdk_home}/bin/jhsdb
+ jdk:/usr/bin/jimage:/${_jdk_home}/bin/jimage
+ jdk:/usr/bin/jinfo:/${_jdk_home}/bin/jinfo
+ jdk:/usr/bin/jjs:/${_jdk_home}/bin/jjs
+ jdk:/usr/bin/jlink:/${_jdk_home}/bin/jlink
+ jdk:/usr/bin/jmap:/${_jdk_home}/bin/jmap
+ jdk:/usr/bin/jmod:/${_jdk_home}/bin/jmod
+ jdk:/usr/bin/jps:/${_jdk_home}/bin/jps
+ jdk:/usr/bin/jrunscript:/${_jdk_home}/bin/jrunscript
+ jdk:/usr/bin/jshell:/${_jdk_home}/bin/jshell
+ jdk:/usr/bin/jstack:/${_jdk_home}/bin/jstack
+ jdk:/usr/bin/jstat:/${_jdk_home}/bin/jstat
+ jdk:/usr/bin/jstatd:/${_jdk_home}/bin/jstatd
+ jdk:/usr/bin/keytool:/${_jdk_home}/bin/keytool
+ jdk:/usr/bin/pack200:/${_jdk_home}/bin/pack200
+ jdk:/usr/bin/rmic:/${_jdk_home}/bin/rmic
+ jdk:/usr/bin/rmid:/${_jdk_home}/bin/rmid
+ jdk:/usr/bin/rmiregistry:/${_jdk_home}/bin/rmiregistry
+ jdk:/usr/bin/serialver:/${_jdk_home}/bin/serialver
+ jdk:/usr/bin/unpack200:/${_jdk_home}/bin/unpack200
 "
 
 post_extract() {
@@ -151,11 +151,11 @@ do_configure() {
 }
 
 do_install() {
-	vmkdir usr/lib/jvm/openjdk${_java_ver}
-	vcopy build/*-normal-*-release/images/jdk/* "usr/lib/jvm/openjdk${_java_ver}"
-	vmkdir usr/lib/jvm/$_openjdk_version/lib/security
-	make-ca -g -f --destdir "${PWD}/ca" -k "${DESTDIR}/usr/lib/jvm/openjdk${_java_ver}/bin/keytool"
-	mv ./ca/etc/pki/tls/java/cacerts ${DESTDIR}/usr/lib/jvm/openjdk${_java_ver}/lib/security/
+	vmkdir $_jdk_home
+	vcopy build/*-normal-*-release/images/jdk/* $_jdk_home
+	vmkdir $_jdk_home/lib/security
+	make-ca -g -f --destdir "${PWD}/ca" -k $DESTDIR/$_jdk_home/bin/keytool
+	mv ./ca/etc/pki/tls/java/cacerts $DESTDIR/$_jdk_home/lib/security/
 	chmod -R ugo+rw ./ca
 	rm -Rf ./ca
 	vmkdir etc/profile.d
@@ -170,14 +170,14 @@ openjdk11-doc_package() {
 	nostrip=yes
 	noverifyrdeps=yes
 	noshlibprovides=yes
-	short_desc+=" -- documentation"
+	short_desc+=" - documentation"
 	pkg_install() {
 		cd ${wrksrc}
 		if [ "$build_option_docs" ]; then
 			vmkdir usr/share/doc/openjdk11
-			cp -a build/linux-*/images/docs/* ${PKGDESTDIR}/usr/share/doc/openjdk11
+			cp -a build/linux-*/images/docs/* $PKGDESTDIR/usr/share/doc/openjdk11
 		fi
-		vmove usr/lib/jvm/openjdk11/man/man1
+		vmove $_jdk_home/man/man1
 	}
 }
 
@@ -185,17 +185,17 @@ openjdk11-src_package() {
 	nostrip=yes
 	noverifyrdeps=yes
 	noshlibprovides=yes
-	short_desc+=" -- sources"
+	short_desc+=" - sources"
 	pkg_install() {
-		vmove "usr/lib/jvm/openjdk11/lib/src.zip"
+		vmove $_jdk_home/lib/src.zip
 	}
 }
 
 openjdk11-static-libs_package() {
 	notstrip=yes
-	short_desc+=" -- static libs"
+	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}"
+		vmkdir $_jdk_home
+		vcopy build/*-normal-*-release/images/static-libs/lib $_jdk_home
 	}
 }

From f43bd100877631f77ce5bd5da233a0d0a3efdfa9 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Mon, 4 Apr 2022 12:25:32 -0400
Subject: [PATCH 2/2] New package: openjdk11-jre-11.0.12+5.

---
 common/shlibs              | 12 +++++------
 srcpkgs/openjdk11-jre      |  1 +
 srcpkgs/openjdk11/template | 44 ++++++++++++++++++++++++++++++++------
 3 files changed, 44 insertions(+), 13 deletions(-)
 create mode 120000 srcpkgs/openjdk11-jre

diff --git a/common/shlibs b/common/shlibs
index 307cb13347fc..f77f30c048ea 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1809,12 +1809,12 @@ libawt_xawt.so openjdk8-jre-8u20_1
 libjava.so openjdk8-jre-8u20_1
 libjli.so openjdk8-jre-8u20_1
 libjvm.so openjdk8-jre-8u20_1
-libjawt.so openjdk11-11.0.5+10_1
-libawt.so openjdk11-11.0.5+10_1
-libawt_xawt.so openjdk11-11.0.5+10_1
-libjava.so openjdk11-11.0.5+10_1
-libjli.so openjdk11-11.0.5+10_1
-libjvm.so openjdk11-11.0.5+10_1
+libjawt.so openjdk11-jre-11.0.5+10_1
+libawt.so openjdk11-jre-11.0.5+10_1
+libawt_xawt.so openjdk11-jre-11.0.5+10_1
+libjava.so openjdk11-jre-11.0.5+10_1
+libjli.so openjdk11-jre-11.0.5+10_1
+libjvm.so openjdk11-jre-11.0.5+10_1
 libjawt.so openjdk7-bootstrap-7u221b02_1
 libawt.so openjdk7-bootstrap-7u221b02_1
 libawt_xawt.so openjdk7-bootstrap-7u221b02_1
diff --git a/srcpkgs/openjdk11-jre b/srcpkgs/openjdk11-jre
new file mode 120000
index 000000000000..8213494c49ed
--- /dev/null
+++ b/srcpkgs/openjdk11-jre
@@ -0,0 +1 @@
+openjdk11
\ No newline at end of file
diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index 2c670d92ee1d..a2cc31c85aea 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -31,15 +31,14 @@ hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
 makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
  fontconfig-devel zlib-devel lcms2-devel"
-depends="fontconfig"
+depends="${pkgname}-jre-${version}_${revision}"
 short_desc="OpenJDK Java Development Kit"
 maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="GPL-2.0-only WITH Classpath-exception-2.0"
 homepage="http://openjdk.java.net/"
 distfiles="https://hg.openjdk.java.net/jdk-updates/jdk${_java_ver}u/archive/jdk-${version}.tar.gz"
 checksum=ff0edaf800c76ae435840365a9205a5f7277a5a2fd3c79ad874522a15c213559
-provides="java-environment-${version}_1 java-runtime-${version}_1"
-shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so"
+provides="java-environment-${version}_1"
 
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes
@@ -158,14 +157,45 @@ do_install() {
 	mv ./ca/etc/pki/tls/java/cacerts $DESTDIR/$_jdk_home/lib/security/
 	chmod -R ugo+rw ./ca
 	rm -Rf ./ca
-	vmkdir etc/profile.d
-	cat >>${DESTDIR}/etc/profile.d/10_openjdk11.sh <<EOF
-export JAVA_HOME=\${JAVA_HOME=/usr/lib/jvm/openjdk${_java_ver}}
-EOF
 	vlicense ASSEMBLY_EXCEPTION
 	vlicense LICENSE
 }
 
+subpackages="openjdk11-src openjdk11-jre openjdk11-doc openjdk11-static-libs"
+
+openjdk11-jre_package() {
+	shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so"
+	short_desc+=" - runtime components"
+	provides="java-runtime-${version}_1"
+	depends="fontconfig"
+	alternatives="
+	 java:/usr/bin/java:/${_jdk_home}/bin/java
+	 java:/usr/bin/jjs:/${_jdk_home}/bin/jjs
+	 java:/usr/bin/keytool:/${_jdk_home}/bin/keytool
+	 java:/usr/bin/pack200:/${_jdk_home}/bin/pack200
+	 java:/usr/bin/rmid:/${_jdk_home}/bin/rmid
+	 java:/usr/bin/rmiregistry:/${_jdk_home}/bin/rmiregistry
+	 java:/usr/bin/unpack200:/${_jdk_home}/bin/unpack200
+	"
+	pkg_install() {
+		for bf in java jjs keytool pack200 rmid rmiregistry unpack200; do
+			vmove $_jdk_home/bin/$bf
+		done
+
+		for f in lib legal conf release; do
+			vmove $_jdk_home/$f
+		done
+
+		vmkdir etc/profile.d
+		cat >>${PKGDESTDIR}/etc/profile.d/10_openjdk11.sh <<EOF
+export JAVA_HOME=\${JAVA_HOME=/usr/lib/jvm/openjdk${_java_ver}}
+EOF
+
+		vlicense ASSEMBLY_EXCEPTION
+		vlicense LICENSE
+	}
+}
+
 openjdk11-doc_package() {
 	nostrip=yes
 	noverifyrdeps=yes

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PR PATCH] [Updated] openjdk11: cleanup, split jre into subpackage
  2022-04-04 16:29 [PR PATCH] openjdk11: cleanup, split jre into subpackage classabbyamp
                   ` (4 preceding siblings ...)
  2022-04-04 21:04 ` classabbyamp
@ 2022-04-19 15:30 ` classabbyamp
  2022-04-20  2:26 ` classabbyamp
                   ` (11 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: classabbyamp @ 2022-04-19 15:30 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1552 bytes --]

There is an updated pull request by classabbyamp against master on the void-packages repository

https://github.com/classabbyamp/void-packages openjdk11-cleanup
https://github.com/void-linux/void-packages/pull/36520

openjdk11: cleanup, split jre into subpackage
- openjdk11: clean up template
- New package: openjdk11-jre-11.0.12+5.

This should bring openjdk11 more in-line with other openjdk package templates

cc: @knusbaum for maintainer review

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

CI fail on aarch64 and armv7l for unresolvable shlibs can be safely ignored.

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/36520.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openjdk11-cleanup-36520.patch --]
[-- Type: text/x-diff, Size: 11159 bytes --]

From ee41720b7a32b17dc42578c48ac10ac5404408ca Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Mon, 4 Apr 2022 12:15:17 -0400
Subject: [PATCH 1/2] openjdk11: clean up template

---
 srcpkgs/openjdk11/template | 110 ++++++++++++++++++-------------------
 1 file changed, 55 insertions(+), 55 deletions(-)

diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index bd38c0c5c010..2c670d92ee1d 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -1,9 +1,9 @@
 # Template file for 'openjdk11'
 pkgname=openjdk11
 version=11.0.12+5
-revision=2
+revision=3
 _java_ver="${version%%.*}"
-_openjdk_version="openjdk-${_java_ver}"
+_jdk_home="usr/lib/jvm/openjdk${_java_ver}"
 wrksrc="jdk${_java_ver}u-jdk-${version}"
 build_style=gnu-configure
 configure_args="
@@ -68,50 +68,50 @@ if [ ! "$CROSS_BUILD" ]; then
 	configure_args+=" --with-boot-jdk=/usr/lib/jvm/java-10-openjdk"
 else
 	hostmakedepends+=" openjdk11"
-	configure_args+=" --with-boot-jdk=/usr/lib/jvm/openjdk11"
+	configure_args+=" --with-boot-jdk=/${_jdk_home}"
 fi
 
 alternatives="
- java:/usr/bin/java:/usr/lib/jvm/openjdk11/bin/java
- java:/usr/bin/jjs:/usr/lib/jvm/openjdk11/bin/jjs
- java:/usr/bin/keytool:/usr/lib/jvm/openjdk11/bin/keytool
- java:/usr/bin/pack200:/usr/lib/jvm/openjdk11/bin/pack200
- java:/usr/bin/rmid:/usr/lib/jvm/openjdk11/bin/rmid
- java:/usr/bin/rmiregistry:/usr/lib/jvm/openjdk11/bin/rmiregistry
- java:/usr/bin/unpack200:/usr/lib/jvm/openjdk11/bin/unpack200
+ java:/usr/bin/java:/${_jdk_home}/bin/java
+ java:/usr/bin/jjs:/${_jdk_home}/bin/jjs
+ java:/usr/bin/keytool:/${_jdk_home}/bin/keytool
+ java:/usr/bin/pack200:/${_jdk_home}/bin/pack200
+ java:/usr/bin/rmid:/${_jdk_home}/bin/rmid
+ java:/usr/bin/rmiregistry:/${_jdk_home}/bin/rmiregistry
+ java:/usr/bin/unpack200:/${_jdk_home}/bin/unpack200
 
- jdk:/usr/bin/jaotc:/usr/lib/jvm/openjdk11/bin/jaotc
- jdk:/usr/bin/jar:/usr/lib/jvm/openjdk11/bin/jar
- jdk:/usr/bin/jarsigner:/usr/lib/jvm/openjdk11/bin/jarsigner
- jdk:/usr/bin/java:/usr/lib/jvm/openjdk11/bin/java
- jdk:/usr/bin/javac:/usr/lib/jvm/openjdk11/bin/javac
- jdk:/usr/bin/javadoc:/usr/lib/jvm/openjdk11/bin/javadoc
- jdk:/usr/bin/javap:/usr/lib/jvm/openjdk11/bin/javap
- jdk:/usr/bin/jcmd:/usr/lib/jvm/openjdk11/bin/jcmd
- jdk:/usr/bin/jconsole:/usr/lib/jvm/openjdk11/bin/jconsole
- jdk:/usr/bin/jdb:/usr/lib/jvm/openjdk11/bin/jdb
- jdk:/usr/bin/jdeprscan:/usr/lib/jvm/openjdk11/bin/jdeprscan
- jdk:/usr/bin/jdeps:/usr/lib/jvm/openjdk11/bin/jdeps
- jdk:/usr/bin/jhsdb:/usr/lib/jvm/openjdk11/bin/jhsdb
- jdk:/usr/bin/jimage:/usr/lib/jvm/openjdk11/bin/jimage
- jdk:/usr/bin/jinfo:/usr/lib/jvm/openjdk11/bin/jinfo
- jdk:/usr/bin/jjs:/usr/lib/jvm/openjdk11/bin/jjs
- jdk:/usr/bin/jlink:/usr/lib/jvm/openjdk11/bin/jlink
- jdk:/usr/bin/jmap:/usr/lib/jvm/openjdk11/bin/jmap
- jdk:/usr/bin/jmod:/usr/lib/jvm/openjdk11/bin/jmod
- jdk:/usr/bin/jps:/usr/lib/jvm/openjdk11/bin/jps
- jdk:/usr/bin/jrunscript:/usr/lib/jvm/openjdk11/bin/jrunscript
- jdk:/usr/bin/jshell:/usr/lib/jvm/openjdk11/bin/jshell
- jdk:/usr/bin/jstack:/usr/lib/jvm/openjdk11/bin/jstack
- jdk:/usr/bin/jstat:/usr/lib/jvm/openjdk11/bin/jstat
- jdk:/usr/bin/jstatd:/usr/lib/jvm/openjdk11/bin/jstatd
- jdk:/usr/bin/keytool:/usr/lib/jvm/openjdk11/bin/keytool
- jdk:/usr/bin/pack200:/usr/lib/jvm/openjdk11/bin/pack200
- jdk:/usr/bin/rmic:/usr/lib/jvm/openjdk11/bin/rmic
- jdk:/usr/bin/rmid:/usr/lib/jvm/openjdk11/bin/rmid
- jdk:/usr/bin/rmiregistry:/usr/lib/jvm/openjdk11/bin/rmiregistry
- jdk:/usr/bin/serialver:/usr/lib/jvm/openjdk11/bin/serialver
- jdk:/usr/bin/unpack200:/usr/lib/jvm/openjdk11/bin/unpack200
+ jdk:/usr/bin/jaotc:/${_jdk_home}/bin/jaotc
+ jdk:/usr/bin/jar:/${_jdk_home}/bin/jar
+ jdk:/usr/bin/jarsigner:/${_jdk_home}/bin/jarsigner
+ jdk:/usr/bin/java:/${_jdk_home}/bin/java
+ jdk:/usr/bin/javac:/${_jdk_home}/bin/javac
+ jdk:/usr/bin/javadoc:/${_jdk_home}/bin/javadoc
+ jdk:/usr/bin/javap:/${_jdk_home}/bin/javap
+ jdk:/usr/bin/jcmd:/${_jdk_home}/bin/jcmd
+ jdk:/usr/bin/jconsole:/${_jdk_home}/bin/jconsole
+ jdk:/usr/bin/jdb:/${_jdk_home}/bin/jdb
+ jdk:/usr/bin/jdeprscan:/${_jdk_home}/bin/jdeprscan
+ jdk:/usr/bin/jdeps:/${_jdk_home}/bin/jdeps
+ jdk:/usr/bin/jhsdb:/${_jdk_home}/bin/jhsdb
+ jdk:/usr/bin/jimage:/${_jdk_home}/bin/jimage
+ jdk:/usr/bin/jinfo:/${_jdk_home}/bin/jinfo
+ jdk:/usr/bin/jjs:/${_jdk_home}/bin/jjs
+ jdk:/usr/bin/jlink:/${_jdk_home}/bin/jlink
+ jdk:/usr/bin/jmap:/${_jdk_home}/bin/jmap
+ jdk:/usr/bin/jmod:/${_jdk_home}/bin/jmod
+ jdk:/usr/bin/jps:/${_jdk_home}/bin/jps
+ jdk:/usr/bin/jrunscript:/${_jdk_home}/bin/jrunscript
+ jdk:/usr/bin/jshell:/${_jdk_home}/bin/jshell
+ jdk:/usr/bin/jstack:/${_jdk_home}/bin/jstack
+ jdk:/usr/bin/jstat:/${_jdk_home}/bin/jstat
+ jdk:/usr/bin/jstatd:/${_jdk_home}/bin/jstatd
+ jdk:/usr/bin/keytool:/${_jdk_home}/bin/keytool
+ jdk:/usr/bin/pack200:/${_jdk_home}/bin/pack200
+ jdk:/usr/bin/rmic:/${_jdk_home}/bin/rmic
+ jdk:/usr/bin/rmid:/${_jdk_home}/bin/rmid
+ jdk:/usr/bin/rmiregistry:/${_jdk_home}/bin/rmiregistry
+ jdk:/usr/bin/serialver:/${_jdk_home}/bin/serialver
+ jdk:/usr/bin/unpack200:/${_jdk_home}/bin/unpack200
 "
 
 post_extract() {
@@ -151,11 +151,11 @@ do_configure() {
 }
 
 do_install() {
-	vmkdir usr/lib/jvm/openjdk${_java_ver}
-	vcopy build/*-normal-*-release/images/jdk/* "usr/lib/jvm/openjdk${_java_ver}"
-	vmkdir usr/lib/jvm/$_openjdk_version/lib/security
-	make-ca -g -f --destdir "${PWD}/ca" -k "${DESTDIR}/usr/lib/jvm/openjdk${_java_ver}/bin/keytool"
-	mv ./ca/etc/pki/tls/java/cacerts ${DESTDIR}/usr/lib/jvm/openjdk${_java_ver}/lib/security/
+	vmkdir $_jdk_home
+	vcopy build/*-normal-*-release/images/jdk/* $_jdk_home
+	vmkdir $_jdk_home/lib/security
+	make-ca -g -f --destdir "${PWD}/ca" -k $DESTDIR/$_jdk_home/bin/keytool
+	mv ./ca/etc/pki/tls/java/cacerts $DESTDIR/$_jdk_home/lib/security/
 	chmod -R ugo+rw ./ca
 	rm -Rf ./ca
 	vmkdir etc/profile.d
@@ -170,14 +170,14 @@ openjdk11-doc_package() {
 	nostrip=yes
 	noverifyrdeps=yes
 	noshlibprovides=yes
-	short_desc+=" -- documentation"
+	short_desc+=" - documentation"
 	pkg_install() {
 		cd ${wrksrc}
 		if [ "$build_option_docs" ]; then
 			vmkdir usr/share/doc/openjdk11
-			cp -a build/linux-*/images/docs/* ${PKGDESTDIR}/usr/share/doc/openjdk11
+			cp -a build/linux-*/images/docs/* $PKGDESTDIR/usr/share/doc/openjdk11
 		fi
-		vmove usr/lib/jvm/openjdk11/man/man1
+		vmove $_jdk_home/man/man1
 	}
 }
 
@@ -185,17 +185,17 @@ openjdk11-src_package() {
 	nostrip=yes
 	noverifyrdeps=yes
 	noshlibprovides=yes
-	short_desc+=" -- sources"
+	short_desc+=" - sources"
 	pkg_install() {
-		vmove "usr/lib/jvm/openjdk11/lib/src.zip"
+		vmove $_jdk_home/lib/src.zip
 	}
 }
 
 openjdk11-static-libs_package() {
 	notstrip=yes
-	short_desc+=" -- static libs"
+	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}"
+		vmkdir $_jdk_home
+		vcopy build/*-normal-*-release/images/static-libs/lib $_jdk_home
 	}
 }

From c7f16fc13c1989dc1a6b6292d8d7a4132a6a8f72 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Mon, 4 Apr 2022 12:25:32 -0400
Subject: [PATCH 2/2] New package: openjdk11-jre-11.0.12+5.

---
 common/shlibs              | 12 +++++------
 srcpkgs/openjdk11-jre      |  1 +
 srcpkgs/openjdk11/template | 44 ++++++++++++++++++++++++++++++++------
 3 files changed, 44 insertions(+), 13 deletions(-)
 create mode 120000 srcpkgs/openjdk11-jre

diff --git a/common/shlibs b/common/shlibs
index ae4bb44c57a3..458a4c40b16e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1810,12 +1810,12 @@ libawt_xawt.so openjdk8-jre-8u20_1
 libjava.so openjdk8-jre-8u20_1
 libjli.so openjdk8-jre-8u20_1
 libjvm.so openjdk8-jre-8u20_1
-libjawt.so openjdk11-11.0.5+10_1
-libawt.so openjdk11-11.0.5+10_1
-libawt_xawt.so openjdk11-11.0.5+10_1
-libjava.so openjdk11-11.0.5+10_1
-libjli.so openjdk11-11.0.5+10_1
-libjvm.so openjdk11-11.0.5+10_1
+libjawt.so openjdk11-jre-11.0.5+10_1
+libawt.so openjdk11-jre-11.0.5+10_1
+libawt_xawt.so openjdk11-jre-11.0.5+10_1
+libjava.so openjdk11-jre-11.0.5+10_1
+libjli.so openjdk11-jre-11.0.5+10_1
+libjvm.so openjdk11-jre-11.0.5+10_1
 libjawt.so openjdk7-bootstrap-7u221b02_1
 libawt.so openjdk7-bootstrap-7u221b02_1
 libawt_xawt.so openjdk7-bootstrap-7u221b02_1
diff --git a/srcpkgs/openjdk11-jre b/srcpkgs/openjdk11-jre
new file mode 120000
index 000000000000..8213494c49ed
--- /dev/null
+++ b/srcpkgs/openjdk11-jre
@@ -0,0 +1 @@
+openjdk11
\ No newline at end of file
diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index 2c670d92ee1d..a2cc31c85aea 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -31,15 +31,14 @@ hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
 makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
  fontconfig-devel zlib-devel lcms2-devel"
-depends="fontconfig"
+depends="${pkgname}-jre-${version}_${revision}"
 short_desc="OpenJDK Java Development Kit"
 maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="GPL-2.0-only WITH Classpath-exception-2.0"
 homepage="http://openjdk.java.net/"
 distfiles="https://hg.openjdk.java.net/jdk-updates/jdk${_java_ver}u/archive/jdk-${version}.tar.gz"
 checksum=ff0edaf800c76ae435840365a9205a5f7277a5a2fd3c79ad874522a15c213559
-provides="java-environment-${version}_1 java-runtime-${version}_1"
-shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so"
+provides="java-environment-${version}_1"
 
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes
@@ -158,14 +157,45 @@ do_install() {
 	mv ./ca/etc/pki/tls/java/cacerts $DESTDIR/$_jdk_home/lib/security/
 	chmod -R ugo+rw ./ca
 	rm -Rf ./ca
-	vmkdir etc/profile.d
-	cat >>${DESTDIR}/etc/profile.d/10_openjdk11.sh <<EOF
-export JAVA_HOME=\${JAVA_HOME=/usr/lib/jvm/openjdk${_java_ver}}
-EOF
 	vlicense ASSEMBLY_EXCEPTION
 	vlicense LICENSE
 }
 
+subpackages="openjdk11-src openjdk11-jre openjdk11-doc openjdk11-static-libs"
+
+openjdk11-jre_package() {
+	shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so"
+	short_desc+=" - runtime components"
+	provides="java-runtime-${version}_1"
+	depends="fontconfig"
+	alternatives="
+	 java:/usr/bin/java:/${_jdk_home}/bin/java
+	 java:/usr/bin/jjs:/${_jdk_home}/bin/jjs
+	 java:/usr/bin/keytool:/${_jdk_home}/bin/keytool
+	 java:/usr/bin/pack200:/${_jdk_home}/bin/pack200
+	 java:/usr/bin/rmid:/${_jdk_home}/bin/rmid
+	 java:/usr/bin/rmiregistry:/${_jdk_home}/bin/rmiregistry
+	 java:/usr/bin/unpack200:/${_jdk_home}/bin/unpack200
+	"
+	pkg_install() {
+		for bf in java jjs keytool pack200 rmid rmiregistry unpack200; do
+			vmove $_jdk_home/bin/$bf
+		done
+
+		for f in lib legal conf release; do
+			vmove $_jdk_home/$f
+		done
+
+		vmkdir etc/profile.d
+		cat >>${PKGDESTDIR}/etc/profile.d/10_openjdk11.sh <<EOF
+export JAVA_HOME=\${JAVA_HOME=/usr/lib/jvm/openjdk${_java_ver}}
+EOF
+
+		vlicense ASSEMBLY_EXCEPTION
+		vlicense LICENSE
+	}
+}
+
 openjdk11-doc_package() {
 	nostrip=yes
 	noverifyrdeps=yes

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PR PATCH] [Updated] openjdk11: cleanup, split jre into subpackage
  2022-04-04 16:29 [PR PATCH] openjdk11: cleanup, split jre into subpackage classabbyamp
                   ` (5 preceding siblings ...)
  2022-04-19 15:30 ` classabbyamp
@ 2022-04-20  2:26 ` classabbyamp
  2022-04-20 23:54 ` classabbyamp
                   ` (10 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: classabbyamp @ 2022-04-20  2:26 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1552 bytes --]

There is an updated pull request by classabbyamp against master on the void-packages repository

https://github.com/classabbyamp/void-packages openjdk11-cleanup
https://github.com/void-linux/void-packages/pull/36520

openjdk11: cleanup, split jre into subpackage
- openjdk11: clean up template
- New package: openjdk11-jre-11.0.12+5.

This should bring openjdk11 more in-line with other openjdk package templates

cc: @knusbaum for maintainer review

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

CI fail on aarch64 and armv7l for unresolvable shlibs can be safely ignored.

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/36520.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openjdk11-cleanup-36520.patch --]
[-- Type: text/x-diff, Size: 11159 bytes --]

From ee41720b7a32b17dc42578c48ac10ac5404408ca Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Mon, 4 Apr 2022 12:15:17 -0400
Subject: [PATCH 1/2] openjdk11: clean up template

---
 srcpkgs/openjdk11/template | 110 ++++++++++++++++++-------------------
 1 file changed, 55 insertions(+), 55 deletions(-)

diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index bd38c0c5c010..2c670d92ee1d 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -1,9 +1,9 @@
 # Template file for 'openjdk11'
 pkgname=openjdk11
 version=11.0.12+5
-revision=2
+revision=3
 _java_ver="${version%%.*}"
-_openjdk_version="openjdk-${_java_ver}"
+_jdk_home="usr/lib/jvm/openjdk${_java_ver}"
 wrksrc="jdk${_java_ver}u-jdk-${version}"
 build_style=gnu-configure
 configure_args="
@@ -68,50 +68,50 @@ if [ ! "$CROSS_BUILD" ]; then
 	configure_args+=" --with-boot-jdk=/usr/lib/jvm/java-10-openjdk"
 else
 	hostmakedepends+=" openjdk11"
-	configure_args+=" --with-boot-jdk=/usr/lib/jvm/openjdk11"
+	configure_args+=" --with-boot-jdk=/${_jdk_home}"
 fi
 
 alternatives="
- java:/usr/bin/java:/usr/lib/jvm/openjdk11/bin/java
- java:/usr/bin/jjs:/usr/lib/jvm/openjdk11/bin/jjs
- java:/usr/bin/keytool:/usr/lib/jvm/openjdk11/bin/keytool
- java:/usr/bin/pack200:/usr/lib/jvm/openjdk11/bin/pack200
- java:/usr/bin/rmid:/usr/lib/jvm/openjdk11/bin/rmid
- java:/usr/bin/rmiregistry:/usr/lib/jvm/openjdk11/bin/rmiregistry
- java:/usr/bin/unpack200:/usr/lib/jvm/openjdk11/bin/unpack200
+ java:/usr/bin/java:/${_jdk_home}/bin/java
+ java:/usr/bin/jjs:/${_jdk_home}/bin/jjs
+ java:/usr/bin/keytool:/${_jdk_home}/bin/keytool
+ java:/usr/bin/pack200:/${_jdk_home}/bin/pack200
+ java:/usr/bin/rmid:/${_jdk_home}/bin/rmid
+ java:/usr/bin/rmiregistry:/${_jdk_home}/bin/rmiregistry
+ java:/usr/bin/unpack200:/${_jdk_home}/bin/unpack200
 
- jdk:/usr/bin/jaotc:/usr/lib/jvm/openjdk11/bin/jaotc
- jdk:/usr/bin/jar:/usr/lib/jvm/openjdk11/bin/jar
- jdk:/usr/bin/jarsigner:/usr/lib/jvm/openjdk11/bin/jarsigner
- jdk:/usr/bin/java:/usr/lib/jvm/openjdk11/bin/java
- jdk:/usr/bin/javac:/usr/lib/jvm/openjdk11/bin/javac
- jdk:/usr/bin/javadoc:/usr/lib/jvm/openjdk11/bin/javadoc
- jdk:/usr/bin/javap:/usr/lib/jvm/openjdk11/bin/javap
- jdk:/usr/bin/jcmd:/usr/lib/jvm/openjdk11/bin/jcmd
- jdk:/usr/bin/jconsole:/usr/lib/jvm/openjdk11/bin/jconsole
- jdk:/usr/bin/jdb:/usr/lib/jvm/openjdk11/bin/jdb
- jdk:/usr/bin/jdeprscan:/usr/lib/jvm/openjdk11/bin/jdeprscan
- jdk:/usr/bin/jdeps:/usr/lib/jvm/openjdk11/bin/jdeps
- jdk:/usr/bin/jhsdb:/usr/lib/jvm/openjdk11/bin/jhsdb
- jdk:/usr/bin/jimage:/usr/lib/jvm/openjdk11/bin/jimage
- jdk:/usr/bin/jinfo:/usr/lib/jvm/openjdk11/bin/jinfo
- jdk:/usr/bin/jjs:/usr/lib/jvm/openjdk11/bin/jjs
- jdk:/usr/bin/jlink:/usr/lib/jvm/openjdk11/bin/jlink
- jdk:/usr/bin/jmap:/usr/lib/jvm/openjdk11/bin/jmap
- jdk:/usr/bin/jmod:/usr/lib/jvm/openjdk11/bin/jmod
- jdk:/usr/bin/jps:/usr/lib/jvm/openjdk11/bin/jps
- jdk:/usr/bin/jrunscript:/usr/lib/jvm/openjdk11/bin/jrunscript
- jdk:/usr/bin/jshell:/usr/lib/jvm/openjdk11/bin/jshell
- jdk:/usr/bin/jstack:/usr/lib/jvm/openjdk11/bin/jstack
- jdk:/usr/bin/jstat:/usr/lib/jvm/openjdk11/bin/jstat
- jdk:/usr/bin/jstatd:/usr/lib/jvm/openjdk11/bin/jstatd
- jdk:/usr/bin/keytool:/usr/lib/jvm/openjdk11/bin/keytool
- jdk:/usr/bin/pack200:/usr/lib/jvm/openjdk11/bin/pack200
- jdk:/usr/bin/rmic:/usr/lib/jvm/openjdk11/bin/rmic
- jdk:/usr/bin/rmid:/usr/lib/jvm/openjdk11/bin/rmid
- jdk:/usr/bin/rmiregistry:/usr/lib/jvm/openjdk11/bin/rmiregistry
- jdk:/usr/bin/serialver:/usr/lib/jvm/openjdk11/bin/serialver
- jdk:/usr/bin/unpack200:/usr/lib/jvm/openjdk11/bin/unpack200
+ jdk:/usr/bin/jaotc:/${_jdk_home}/bin/jaotc
+ jdk:/usr/bin/jar:/${_jdk_home}/bin/jar
+ jdk:/usr/bin/jarsigner:/${_jdk_home}/bin/jarsigner
+ jdk:/usr/bin/java:/${_jdk_home}/bin/java
+ jdk:/usr/bin/javac:/${_jdk_home}/bin/javac
+ jdk:/usr/bin/javadoc:/${_jdk_home}/bin/javadoc
+ jdk:/usr/bin/javap:/${_jdk_home}/bin/javap
+ jdk:/usr/bin/jcmd:/${_jdk_home}/bin/jcmd
+ jdk:/usr/bin/jconsole:/${_jdk_home}/bin/jconsole
+ jdk:/usr/bin/jdb:/${_jdk_home}/bin/jdb
+ jdk:/usr/bin/jdeprscan:/${_jdk_home}/bin/jdeprscan
+ jdk:/usr/bin/jdeps:/${_jdk_home}/bin/jdeps
+ jdk:/usr/bin/jhsdb:/${_jdk_home}/bin/jhsdb
+ jdk:/usr/bin/jimage:/${_jdk_home}/bin/jimage
+ jdk:/usr/bin/jinfo:/${_jdk_home}/bin/jinfo
+ jdk:/usr/bin/jjs:/${_jdk_home}/bin/jjs
+ jdk:/usr/bin/jlink:/${_jdk_home}/bin/jlink
+ jdk:/usr/bin/jmap:/${_jdk_home}/bin/jmap
+ jdk:/usr/bin/jmod:/${_jdk_home}/bin/jmod
+ jdk:/usr/bin/jps:/${_jdk_home}/bin/jps
+ jdk:/usr/bin/jrunscript:/${_jdk_home}/bin/jrunscript
+ jdk:/usr/bin/jshell:/${_jdk_home}/bin/jshell
+ jdk:/usr/bin/jstack:/${_jdk_home}/bin/jstack
+ jdk:/usr/bin/jstat:/${_jdk_home}/bin/jstat
+ jdk:/usr/bin/jstatd:/${_jdk_home}/bin/jstatd
+ jdk:/usr/bin/keytool:/${_jdk_home}/bin/keytool
+ jdk:/usr/bin/pack200:/${_jdk_home}/bin/pack200
+ jdk:/usr/bin/rmic:/${_jdk_home}/bin/rmic
+ jdk:/usr/bin/rmid:/${_jdk_home}/bin/rmid
+ jdk:/usr/bin/rmiregistry:/${_jdk_home}/bin/rmiregistry
+ jdk:/usr/bin/serialver:/${_jdk_home}/bin/serialver
+ jdk:/usr/bin/unpack200:/${_jdk_home}/bin/unpack200
 "
 
 post_extract() {
@@ -151,11 +151,11 @@ do_configure() {
 }
 
 do_install() {
-	vmkdir usr/lib/jvm/openjdk${_java_ver}
-	vcopy build/*-normal-*-release/images/jdk/* "usr/lib/jvm/openjdk${_java_ver}"
-	vmkdir usr/lib/jvm/$_openjdk_version/lib/security
-	make-ca -g -f --destdir "${PWD}/ca" -k "${DESTDIR}/usr/lib/jvm/openjdk${_java_ver}/bin/keytool"
-	mv ./ca/etc/pki/tls/java/cacerts ${DESTDIR}/usr/lib/jvm/openjdk${_java_ver}/lib/security/
+	vmkdir $_jdk_home
+	vcopy build/*-normal-*-release/images/jdk/* $_jdk_home
+	vmkdir $_jdk_home/lib/security
+	make-ca -g -f --destdir "${PWD}/ca" -k $DESTDIR/$_jdk_home/bin/keytool
+	mv ./ca/etc/pki/tls/java/cacerts $DESTDIR/$_jdk_home/lib/security/
 	chmod -R ugo+rw ./ca
 	rm -Rf ./ca
 	vmkdir etc/profile.d
@@ -170,14 +170,14 @@ openjdk11-doc_package() {
 	nostrip=yes
 	noverifyrdeps=yes
 	noshlibprovides=yes
-	short_desc+=" -- documentation"
+	short_desc+=" - documentation"
 	pkg_install() {
 		cd ${wrksrc}
 		if [ "$build_option_docs" ]; then
 			vmkdir usr/share/doc/openjdk11
-			cp -a build/linux-*/images/docs/* ${PKGDESTDIR}/usr/share/doc/openjdk11
+			cp -a build/linux-*/images/docs/* $PKGDESTDIR/usr/share/doc/openjdk11
 		fi
-		vmove usr/lib/jvm/openjdk11/man/man1
+		vmove $_jdk_home/man/man1
 	}
 }
 
@@ -185,17 +185,17 @@ openjdk11-src_package() {
 	nostrip=yes
 	noverifyrdeps=yes
 	noshlibprovides=yes
-	short_desc+=" -- sources"
+	short_desc+=" - sources"
 	pkg_install() {
-		vmove "usr/lib/jvm/openjdk11/lib/src.zip"
+		vmove $_jdk_home/lib/src.zip
 	}
 }
 
 openjdk11-static-libs_package() {
 	notstrip=yes
-	short_desc+=" -- static libs"
+	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}"
+		vmkdir $_jdk_home
+		vcopy build/*-normal-*-release/images/static-libs/lib $_jdk_home
 	}
 }

From d8034a01c7edb853bbde0badc852497a08f2acbb Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Mon, 4 Apr 2022 12:25:32 -0400
Subject: [PATCH 2/2] New package: openjdk11-jre-11.0.12+5.

---
 common/shlibs              | 12 +++++------
 srcpkgs/openjdk11-jre      |  1 +
 srcpkgs/openjdk11/template | 44 ++++++++++++++++++++++++++++++++------
 3 files changed, 44 insertions(+), 13 deletions(-)
 create mode 120000 srcpkgs/openjdk11-jre

diff --git a/common/shlibs b/common/shlibs
index ae4bb44c57a3..458a4c40b16e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1810,12 +1810,12 @@ libawt_xawt.so openjdk8-jre-8u20_1
 libjava.so openjdk8-jre-8u20_1
 libjli.so openjdk8-jre-8u20_1
 libjvm.so openjdk8-jre-8u20_1
-libjawt.so openjdk11-11.0.5+10_1
-libawt.so openjdk11-11.0.5+10_1
-libawt_xawt.so openjdk11-11.0.5+10_1
-libjava.so openjdk11-11.0.5+10_1
-libjli.so openjdk11-11.0.5+10_1
-libjvm.so openjdk11-11.0.5+10_1
+libjawt.so openjdk11-jre-11.0.5+10_1
+libawt.so openjdk11-jre-11.0.5+10_1
+libawt_xawt.so openjdk11-jre-11.0.5+10_1
+libjava.so openjdk11-jre-11.0.5+10_1
+libjli.so openjdk11-jre-11.0.5+10_1
+libjvm.so openjdk11-jre-11.0.5+10_1
 libjawt.so openjdk7-bootstrap-7u221b02_1
 libawt.so openjdk7-bootstrap-7u221b02_1
 libawt_xawt.so openjdk7-bootstrap-7u221b02_1
diff --git a/srcpkgs/openjdk11-jre b/srcpkgs/openjdk11-jre
new file mode 120000
index 000000000000..8213494c49ed
--- /dev/null
+++ b/srcpkgs/openjdk11-jre
@@ -0,0 +1 @@
+openjdk11
\ No newline at end of file
diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index 2c670d92ee1d..a2cc31c85aea 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -31,15 +31,14 @@ hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
 makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
  fontconfig-devel zlib-devel lcms2-devel"
-depends="fontconfig"
+depends="${pkgname}-jre-${version}_${revision}"
 short_desc="OpenJDK Java Development Kit"
 maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="GPL-2.0-only WITH Classpath-exception-2.0"
 homepage="http://openjdk.java.net/"
 distfiles="https://hg.openjdk.java.net/jdk-updates/jdk${_java_ver}u/archive/jdk-${version}.tar.gz"
 checksum=ff0edaf800c76ae435840365a9205a5f7277a5a2fd3c79ad874522a15c213559
-provides="java-environment-${version}_1 java-runtime-${version}_1"
-shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so"
+provides="java-environment-${version}_1"
 
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes
@@ -158,14 +157,45 @@ do_install() {
 	mv ./ca/etc/pki/tls/java/cacerts $DESTDIR/$_jdk_home/lib/security/
 	chmod -R ugo+rw ./ca
 	rm -Rf ./ca
-	vmkdir etc/profile.d
-	cat >>${DESTDIR}/etc/profile.d/10_openjdk11.sh <<EOF
-export JAVA_HOME=\${JAVA_HOME=/usr/lib/jvm/openjdk${_java_ver}}
-EOF
 	vlicense ASSEMBLY_EXCEPTION
 	vlicense LICENSE
 }
 
+subpackages="openjdk11-src openjdk11-jre openjdk11-doc openjdk11-static-libs"
+
+openjdk11-jre_package() {
+	shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so"
+	short_desc+=" - runtime components"
+	provides="java-runtime-${version}_1"
+	depends="fontconfig"
+	alternatives="
+	 java:/usr/bin/java:/${_jdk_home}/bin/java
+	 java:/usr/bin/jjs:/${_jdk_home}/bin/jjs
+	 java:/usr/bin/keytool:/${_jdk_home}/bin/keytool
+	 java:/usr/bin/pack200:/${_jdk_home}/bin/pack200
+	 java:/usr/bin/rmid:/${_jdk_home}/bin/rmid
+	 java:/usr/bin/rmiregistry:/${_jdk_home}/bin/rmiregistry
+	 java:/usr/bin/unpack200:/${_jdk_home}/bin/unpack200
+	"
+	pkg_install() {
+		for bf in java jjs keytool pack200 rmid rmiregistry unpack200; do
+			vmove $_jdk_home/bin/$bf
+		done
+
+		for f in lib legal conf release; do
+			vmove $_jdk_home/$f
+		done
+
+		vmkdir etc/profile.d
+		cat >>${PKGDESTDIR}/etc/profile.d/10_openjdk11.sh <<EOF
+export JAVA_HOME=\${JAVA_HOME=/usr/lib/jvm/openjdk${_java_ver}}
+EOF
+
+		vlicense ASSEMBLY_EXCEPTION
+		vlicense LICENSE
+	}
+}
+
 openjdk11-doc_package() {
 	nostrip=yes
 	noverifyrdeps=yes

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PR PATCH] [Updated] openjdk11: cleanup, split jre into subpackage
  2022-04-04 16:29 [PR PATCH] openjdk11: cleanup, split jre into subpackage classabbyamp
                   ` (6 preceding siblings ...)
  2022-04-20  2:26 ` classabbyamp
@ 2022-04-20 23:54 ` classabbyamp
  2022-04-21  0:15 ` [PR PATCH] [Updated] openjdk11: cleanup, split jre, jmods " classabbyamp
                   ` (9 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: classabbyamp @ 2022-04-20 23:54 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1552 bytes --]

There is an updated pull request by classabbyamp against master on the void-packages repository

https://github.com/classabbyamp/void-packages openjdk11-cleanup
https://github.com/void-linux/void-packages/pull/36520

openjdk11: cleanup, split jre into subpackage
- openjdk11: clean up template
- New package: openjdk11-jre-11.0.12+5.

This should bring openjdk11 more in-line with other openjdk package templates

cc: @knusbaum for maintainer review

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

CI fail on aarch64 and armv7l for unresolvable shlibs can be safely ignored.

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/36520.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openjdk11-cleanup-36520.patch --]
[-- Type: text/x-diff, Size: 12584 bytes --]

From ee41720b7a32b17dc42578c48ac10ac5404408ca Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Mon, 4 Apr 2022 12:15:17 -0400
Subject: [PATCH 1/3] openjdk11: clean up template

---
 srcpkgs/openjdk11/template | 110 ++++++++++++++++++-------------------
 1 file changed, 55 insertions(+), 55 deletions(-)

diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index bd38c0c5c010..2c670d92ee1d 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -1,9 +1,9 @@
 # Template file for 'openjdk11'
 pkgname=openjdk11
 version=11.0.12+5
-revision=2
+revision=3
 _java_ver="${version%%.*}"
-_openjdk_version="openjdk-${_java_ver}"
+_jdk_home="usr/lib/jvm/openjdk${_java_ver}"
 wrksrc="jdk${_java_ver}u-jdk-${version}"
 build_style=gnu-configure
 configure_args="
@@ -68,50 +68,50 @@ if [ ! "$CROSS_BUILD" ]; then
 	configure_args+=" --with-boot-jdk=/usr/lib/jvm/java-10-openjdk"
 else
 	hostmakedepends+=" openjdk11"
-	configure_args+=" --with-boot-jdk=/usr/lib/jvm/openjdk11"
+	configure_args+=" --with-boot-jdk=/${_jdk_home}"
 fi
 
 alternatives="
- java:/usr/bin/java:/usr/lib/jvm/openjdk11/bin/java
- java:/usr/bin/jjs:/usr/lib/jvm/openjdk11/bin/jjs
- java:/usr/bin/keytool:/usr/lib/jvm/openjdk11/bin/keytool
- java:/usr/bin/pack200:/usr/lib/jvm/openjdk11/bin/pack200
- java:/usr/bin/rmid:/usr/lib/jvm/openjdk11/bin/rmid
- java:/usr/bin/rmiregistry:/usr/lib/jvm/openjdk11/bin/rmiregistry
- java:/usr/bin/unpack200:/usr/lib/jvm/openjdk11/bin/unpack200
+ java:/usr/bin/java:/${_jdk_home}/bin/java
+ java:/usr/bin/jjs:/${_jdk_home}/bin/jjs
+ java:/usr/bin/keytool:/${_jdk_home}/bin/keytool
+ java:/usr/bin/pack200:/${_jdk_home}/bin/pack200
+ java:/usr/bin/rmid:/${_jdk_home}/bin/rmid
+ java:/usr/bin/rmiregistry:/${_jdk_home}/bin/rmiregistry
+ java:/usr/bin/unpack200:/${_jdk_home}/bin/unpack200
 
- jdk:/usr/bin/jaotc:/usr/lib/jvm/openjdk11/bin/jaotc
- jdk:/usr/bin/jar:/usr/lib/jvm/openjdk11/bin/jar
- jdk:/usr/bin/jarsigner:/usr/lib/jvm/openjdk11/bin/jarsigner
- jdk:/usr/bin/java:/usr/lib/jvm/openjdk11/bin/java
- jdk:/usr/bin/javac:/usr/lib/jvm/openjdk11/bin/javac
- jdk:/usr/bin/javadoc:/usr/lib/jvm/openjdk11/bin/javadoc
- jdk:/usr/bin/javap:/usr/lib/jvm/openjdk11/bin/javap
- jdk:/usr/bin/jcmd:/usr/lib/jvm/openjdk11/bin/jcmd
- jdk:/usr/bin/jconsole:/usr/lib/jvm/openjdk11/bin/jconsole
- jdk:/usr/bin/jdb:/usr/lib/jvm/openjdk11/bin/jdb
- jdk:/usr/bin/jdeprscan:/usr/lib/jvm/openjdk11/bin/jdeprscan
- jdk:/usr/bin/jdeps:/usr/lib/jvm/openjdk11/bin/jdeps
- jdk:/usr/bin/jhsdb:/usr/lib/jvm/openjdk11/bin/jhsdb
- jdk:/usr/bin/jimage:/usr/lib/jvm/openjdk11/bin/jimage
- jdk:/usr/bin/jinfo:/usr/lib/jvm/openjdk11/bin/jinfo
- jdk:/usr/bin/jjs:/usr/lib/jvm/openjdk11/bin/jjs
- jdk:/usr/bin/jlink:/usr/lib/jvm/openjdk11/bin/jlink
- jdk:/usr/bin/jmap:/usr/lib/jvm/openjdk11/bin/jmap
- jdk:/usr/bin/jmod:/usr/lib/jvm/openjdk11/bin/jmod
- jdk:/usr/bin/jps:/usr/lib/jvm/openjdk11/bin/jps
- jdk:/usr/bin/jrunscript:/usr/lib/jvm/openjdk11/bin/jrunscript
- jdk:/usr/bin/jshell:/usr/lib/jvm/openjdk11/bin/jshell
- jdk:/usr/bin/jstack:/usr/lib/jvm/openjdk11/bin/jstack
- jdk:/usr/bin/jstat:/usr/lib/jvm/openjdk11/bin/jstat
- jdk:/usr/bin/jstatd:/usr/lib/jvm/openjdk11/bin/jstatd
- jdk:/usr/bin/keytool:/usr/lib/jvm/openjdk11/bin/keytool
- jdk:/usr/bin/pack200:/usr/lib/jvm/openjdk11/bin/pack200
- jdk:/usr/bin/rmic:/usr/lib/jvm/openjdk11/bin/rmic
- jdk:/usr/bin/rmid:/usr/lib/jvm/openjdk11/bin/rmid
- jdk:/usr/bin/rmiregistry:/usr/lib/jvm/openjdk11/bin/rmiregistry
- jdk:/usr/bin/serialver:/usr/lib/jvm/openjdk11/bin/serialver
- jdk:/usr/bin/unpack200:/usr/lib/jvm/openjdk11/bin/unpack200
+ jdk:/usr/bin/jaotc:/${_jdk_home}/bin/jaotc
+ jdk:/usr/bin/jar:/${_jdk_home}/bin/jar
+ jdk:/usr/bin/jarsigner:/${_jdk_home}/bin/jarsigner
+ jdk:/usr/bin/java:/${_jdk_home}/bin/java
+ jdk:/usr/bin/javac:/${_jdk_home}/bin/javac
+ jdk:/usr/bin/javadoc:/${_jdk_home}/bin/javadoc
+ jdk:/usr/bin/javap:/${_jdk_home}/bin/javap
+ jdk:/usr/bin/jcmd:/${_jdk_home}/bin/jcmd
+ jdk:/usr/bin/jconsole:/${_jdk_home}/bin/jconsole
+ jdk:/usr/bin/jdb:/${_jdk_home}/bin/jdb
+ jdk:/usr/bin/jdeprscan:/${_jdk_home}/bin/jdeprscan
+ jdk:/usr/bin/jdeps:/${_jdk_home}/bin/jdeps
+ jdk:/usr/bin/jhsdb:/${_jdk_home}/bin/jhsdb
+ jdk:/usr/bin/jimage:/${_jdk_home}/bin/jimage
+ jdk:/usr/bin/jinfo:/${_jdk_home}/bin/jinfo
+ jdk:/usr/bin/jjs:/${_jdk_home}/bin/jjs
+ jdk:/usr/bin/jlink:/${_jdk_home}/bin/jlink
+ jdk:/usr/bin/jmap:/${_jdk_home}/bin/jmap
+ jdk:/usr/bin/jmod:/${_jdk_home}/bin/jmod
+ jdk:/usr/bin/jps:/${_jdk_home}/bin/jps
+ jdk:/usr/bin/jrunscript:/${_jdk_home}/bin/jrunscript
+ jdk:/usr/bin/jshell:/${_jdk_home}/bin/jshell
+ jdk:/usr/bin/jstack:/${_jdk_home}/bin/jstack
+ jdk:/usr/bin/jstat:/${_jdk_home}/bin/jstat
+ jdk:/usr/bin/jstatd:/${_jdk_home}/bin/jstatd
+ jdk:/usr/bin/keytool:/${_jdk_home}/bin/keytool
+ jdk:/usr/bin/pack200:/${_jdk_home}/bin/pack200
+ jdk:/usr/bin/rmic:/${_jdk_home}/bin/rmic
+ jdk:/usr/bin/rmid:/${_jdk_home}/bin/rmid
+ jdk:/usr/bin/rmiregistry:/${_jdk_home}/bin/rmiregistry
+ jdk:/usr/bin/serialver:/${_jdk_home}/bin/serialver
+ jdk:/usr/bin/unpack200:/${_jdk_home}/bin/unpack200
 "
 
 post_extract() {
@@ -151,11 +151,11 @@ do_configure() {
 }
 
 do_install() {
-	vmkdir usr/lib/jvm/openjdk${_java_ver}
-	vcopy build/*-normal-*-release/images/jdk/* "usr/lib/jvm/openjdk${_java_ver}"
-	vmkdir usr/lib/jvm/$_openjdk_version/lib/security
-	make-ca -g -f --destdir "${PWD}/ca" -k "${DESTDIR}/usr/lib/jvm/openjdk${_java_ver}/bin/keytool"
-	mv ./ca/etc/pki/tls/java/cacerts ${DESTDIR}/usr/lib/jvm/openjdk${_java_ver}/lib/security/
+	vmkdir $_jdk_home
+	vcopy build/*-normal-*-release/images/jdk/* $_jdk_home
+	vmkdir $_jdk_home/lib/security
+	make-ca -g -f --destdir "${PWD}/ca" -k $DESTDIR/$_jdk_home/bin/keytool
+	mv ./ca/etc/pki/tls/java/cacerts $DESTDIR/$_jdk_home/lib/security/
 	chmod -R ugo+rw ./ca
 	rm -Rf ./ca
 	vmkdir etc/profile.d
@@ -170,14 +170,14 @@ openjdk11-doc_package() {
 	nostrip=yes
 	noverifyrdeps=yes
 	noshlibprovides=yes
-	short_desc+=" -- documentation"
+	short_desc+=" - documentation"
 	pkg_install() {
 		cd ${wrksrc}
 		if [ "$build_option_docs" ]; then
 			vmkdir usr/share/doc/openjdk11
-			cp -a build/linux-*/images/docs/* ${PKGDESTDIR}/usr/share/doc/openjdk11
+			cp -a build/linux-*/images/docs/* $PKGDESTDIR/usr/share/doc/openjdk11
 		fi
-		vmove usr/lib/jvm/openjdk11/man/man1
+		vmove $_jdk_home/man/man1
 	}
 }
 
@@ -185,17 +185,17 @@ openjdk11-src_package() {
 	nostrip=yes
 	noverifyrdeps=yes
 	noshlibprovides=yes
-	short_desc+=" -- sources"
+	short_desc+=" - sources"
 	pkg_install() {
-		vmove "usr/lib/jvm/openjdk11/lib/src.zip"
+		vmove $_jdk_home/lib/src.zip
 	}
 }
 
 openjdk11-static-libs_package() {
 	notstrip=yes
-	short_desc+=" -- static libs"
+	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}"
+		vmkdir $_jdk_home
+		vcopy build/*-normal-*-release/images/static-libs/lib $_jdk_home
 	}
 }

From d8034a01c7edb853bbde0badc852497a08f2acbb Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Mon, 4 Apr 2022 12:25:32 -0400
Subject: [PATCH 2/3] New package: openjdk11-jre-11.0.12+5.

---
 common/shlibs              | 12 +++++------
 srcpkgs/openjdk11-jre      |  1 +
 srcpkgs/openjdk11/template | 44 ++++++++++++++++++++++++++++++++------
 3 files changed, 44 insertions(+), 13 deletions(-)
 create mode 120000 srcpkgs/openjdk11-jre

diff --git a/common/shlibs b/common/shlibs
index ae4bb44c57a3..458a4c40b16e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1810,12 +1810,12 @@ libawt_xawt.so openjdk8-jre-8u20_1
 libjava.so openjdk8-jre-8u20_1
 libjli.so openjdk8-jre-8u20_1
 libjvm.so openjdk8-jre-8u20_1
-libjawt.so openjdk11-11.0.5+10_1
-libawt.so openjdk11-11.0.5+10_1
-libawt_xawt.so openjdk11-11.0.5+10_1
-libjava.so openjdk11-11.0.5+10_1
-libjli.so openjdk11-11.0.5+10_1
-libjvm.so openjdk11-11.0.5+10_1
+libjawt.so openjdk11-jre-11.0.5+10_1
+libawt.so openjdk11-jre-11.0.5+10_1
+libawt_xawt.so openjdk11-jre-11.0.5+10_1
+libjava.so openjdk11-jre-11.0.5+10_1
+libjli.so openjdk11-jre-11.0.5+10_1
+libjvm.so openjdk11-jre-11.0.5+10_1
 libjawt.so openjdk7-bootstrap-7u221b02_1
 libawt.so openjdk7-bootstrap-7u221b02_1
 libawt_xawt.so openjdk7-bootstrap-7u221b02_1
diff --git a/srcpkgs/openjdk11-jre b/srcpkgs/openjdk11-jre
new file mode 120000
index 000000000000..8213494c49ed
--- /dev/null
+++ b/srcpkgs/openjdk11-jre
@@ -0,0 +1 @@
+openjdk11
\ No newline at end of file
diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index 2c670d92ee1d..a2cc31c85aea 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -31,15 +31,14 @@ hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
 makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
  fontconfig-devel zlib-devel lcms2-devel"
-depends="fontconfig"
+depends="${pkgname}-jre-${version}_${revision}"
 short_desc="OpenJDK Java Development Kit"
 maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="GPL-2.0-only WITH Classpath-exception-2.0"
 homepage="http://openjdk.java.net/"
 distfiles="https://hg.openjdk.java.net/jdk-updates/jdk${_java_ver}u/archive/jdk-${version}.tar.gz"
 checksum=ff0edaf800c76ae435840365a9205a5f7277a5a2fd3c79ad874522a15c213559
-provides="java-environment-${version}_1 java-runtime-${version}_1"
-shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so"
+provides="java-environment-${version}_1"
 
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes
@@ -158,14 +157,45 @@ do_install() {
 	mv ./ca/etc/pki/tls/java/cacerts $DESTDIR/$_jdk_home/lib/security/
 	chmod -R ugo+rw ./ca
 	rm -Rf ./ca
-	vmkdir etc/profile.d
-	cat >>${DESTDIR}/etc/profile.d/10_openjdk11.sh <<EOF
-export JAVA_HOME=\${JAVA_HOME=/usr/lib/jvm/openjdk${_java_ver}}
-EOF
 	vlicense ASSEMBLY_EXCEPTION
 	vlicense LICENSE
 }
 
+subpackages="openjdk11-src openjdk11-jre openjdk11-doc openjdk11-static-libs"
+
+openjdk11-jre_package() {
+	shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so"
+	short_desc+=" - runtime components"
+	provides="java-runtime-${version}_1"
+	depends="fontconfig"
+	alternatives="
+	 java:/usr/bin/java:/${_jdk_home}/bin/java
+	 java:/usr/bin/jjs:/${_jdk_home}/bin/jjs
+	 java:/usr/bin/keytool:/${_jdk_home}/bin/keytool
+	 java:/usr/bin/pack200:/${_jdk_home}/bin/pack200
+	 java:/usr/bin/rmid:/${_jdk_home}/bin/rmid
+	 java:/usr/bin/rmiregistry:/${_jdk_home}/bin/rmiregistry
+	 java:/usr/bin/unpack200:/${_jdk_home}/bin/unpack200
+	"
+	pkg_install() {
+		for bf in java jjs keytool pack200 rmid rmiregistry unpack200; do
+			vmove $_jdk_home/bin/$bf
+		done
+
+		for f in lib legal conf release; do
+			vmove $_jdk_home/$f
+		done
+
+		vmkdir etc/profile.d
+		cat >>${PKGDESTDIR}/etc/profile.d/10_openjdk11.sh <<EOF
+export JAVA_HOME=\${JAVA_HOME=/usr/lib/jvm/openjdk${_java_ver}}
+EOF
+
+		vlicense ASSEMBLY_EXCEPTION
+		vlicense LICENSE
+	}
+}
+
 openjdk11-doc_package() {
 	nostrip=yes
 	noverifyrdeps=yes

From a7a688a958801cea2412ab2b08a6d01892023d91 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 20 Apr 2022 19:53:06 -0400
Subject: [PATCH 3/3] New package: openjdk11-jmods-11.0.12+5

fixes #25183
---
 srcpkgs/openjdk11-jmods    |  1 +
 srcpkgs/openjdk11/template | 10 +++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/openjdk11-jmods

diff --git a/srcpkgs/openjdk11-jmods b/srcpkgs/openjdk11-jmods
new file mode 120000
index 000000000000..8213494c49ed
--- /dev/null
+++ b/srcpkgs/openjdk11-jmods
@@ -0,0 +1 @@
+openjdk11
\ No newline at end of file
diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index a2cc31c85aea..371baf17b1bb 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -161,7 +161,7 @@ do_install() {
 	vlicense LICENSE
 }
 
-subpackages="openjdk11-src openjdk11-jre openjdk11-doc openjdk11-static-libs"
+subpackages="openjdk11-src openjdk11-jre openjdk11-doc openjdk11-jmods openjdk11-static-libs"
 
 openjdk11-jre_package() {
 	shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so"
@@ -229,3 +229,11 @@ openjdk11-static-libs_package() {
 		vcopy build/*-normal-*-release/images/static-libs/lib $_jdk_home
 	}
 }
+
+openjdk11-jmods_package() {
+	short_desc+=" - JMODs"
+	depends="${pkgname}-${version}_${revision}"
+	pkg_install() {
+		vmove $_jdk_home/jmods
+	}
+}

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PR PATCH] [Updated] openjdk11: cleanup, split jre, jmods into subpackage
  2022-04-04 16:29 [PR PATCH] openjdk11: cleanup, split jre into subpackage classabbyamp
                   ` (7 preceding siblings ...)
  2022-04-20 23:54 ` classabbyamp
@ 2022-04-21  0:15 ` classabbyamp
  2022-04-21  1:25 ` [PR PATCH] [Updated] openjdk11: update to 11.0.12+7, cleanup, split jre & jmods into subpkgs classabbyamp
                   ` (8 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: classabbyamp @ 2022-04-21  0:15 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1616 bytes --]

There is an updated pull request by classabbyamp against master on the void-packages repository

https://github.com/classabbyamp/void-packages openjdk11-cleanup
https://github.com/void-linux/void-packages/pull/36520

openjdk11: cleanup, split jre, jmods into subpackage
- openjdk11: clean up template
- New package: openjdk11-jre-11.0.12+5
- New package: openjdk11-jmods-11.0.12+5

fixes #25183

This should bring openjdk11 more in-line with other openjdk package templates

cc: @knusbaum for maintainer review

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

CI fail on aarch64 and armv7l for unresolvable shlibs can be safely ignored.

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/36520.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openjdk11-cleanup-36520.patch --]
[-- Type: text/x-diff, Size: 15303 bytes --]

From ee41720b7a32b17dc42578c48ac10ac5404408ca Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Mon, 4 Apr 2022 12:15:17 -0400
Subject: [PATCH 1/4] openjdk11: clean up template

---
 srcpkgs/openjdk11/template | 110 ++++++++++++++++++-------------------
 1 file changed, 55 insertions(+), 55 deletions(-)

diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index bd38c0c5c010..2c670d92ee1d 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -1,9 +1,9 @@
 # Template file for 'openjdk11'
 pkgname=openjdk11
 version=11.0.12+5
-revision=2
+revision=3
 _java_ver="${version%%.*}"
-_openjdk_version="openjdk-${_java_ver}"
+_jdk_home="usr/lib/jvm/openjdk${_java_ver}"
 wrksrc="jdk${_java_ver}u-jdk-${version}"
 build_style=gnu-configure
 configure_args="
@@ -68,50 +68,50 @@ if [ ! "$CROSS_BUILD" ]; then
 	configure_args+=" --with-boot-jdk=/usr/lib/jvm/java-10-openjdk"
 else
 	hostmakedepends+=" openjdk11"
-	configure_args+=" --with-boot-jdk=/usr/lib/jvm/openjdk11"
+	configure_args+=" --with-boot-jdk=/${_jdk_home}"
 fi
 
 alternatives="
- java:/usr/bin/java:/usr/lib/jvm/openjdk11/bin/java
- java:/usr/bin/jjs:/usr/lib/jvm/openjdk11/bin/jjs
- java:/usr/bin/keytool:/usr/lib/jvm/openjdk11/bin/keytool
- java:/usr/bin/pack200:/usr/lib/jvm/openjdk11/bin/pack200
- java:/usr/bin/rmid:/usr/lib/jvm/openjdk11/bin/rmid
- java:/usr/bin/rmiregistry:/usr/lib/jvm/openjdk11/bin/rmiregistry
- java:/usr/bin/unpack200:/usr/lib/jvm/openjdk11/bin/unpack200
+ java:/usr/bin/java:/${_jdk_home}/bin/java
+ java:/usr/bin/jjs:/${_jdk_home}/bin/jjs
+ java:/usr/bin/keytool:/${_jdk_home}/bin/keytool
+ java:/usr/bin/pack200:/${_jdk_home}/bin/pack200
+ java:/usr/bin/rmid:/${_jdk_home}/bin/rmid
+ java:/usr/bin/rmiregistry:/${_jdk_home}/bin/rmiregistry
+ java:/usr/bin/unpack200:/${_jdk_home}/bin/unpack200
 
- jdk:/usr/bin/jaotc:/usr/lib/jvm/openjdk11/bin/jaotc
- jdk:/usr/bin/jar:/usr/lib/jvm/openjdk11/bin/jar
- jdk:/usr/bin/jarsigner:/usr/lib/jvm/openjdk11/bin/jarsigner
- jdk:/usr/bin/java:/usr/lib/jvm/openjdk11/bin/java
- jdk:/usr/bin/javac:/usr/lib/jvm/openjdk11/bin/javac
- jdk:/usr/bin/javadoc:/usr/lib/jvm/openjdk11/bin/javadoc
- jdk:/usr/bin/javap:/usr/lib/jvm/openjdk11/bin/javap
- jdk:/usr/bin/jcmd:/usr/lib/jvm/openjdk11/bin/jcmd
- jdk:/usr/bin/jconsole:/usr/lib/jvm/openjdk11/bin/jconsole
- jdk:/usr/bin/jdb:/usr/lib/jvm/openjdk11/bin/jdb
- jdk:/usr/bin/jdeprscan:/usr/lib/jvm/openjdk11/bin/jdeprscan
- jdk:/usr/bin/jdeps:/usr/lib/jvm/openjdk11/bin/jdeps
- jdk:/usr/bin/jhsdb:/usr/lib/jvm/openjdk11/bin/jhsdb
- jdk:/usr/bin/jimage:/usr/lib/jvm/openjdk11/bin/jimage
- jdk:/usr/bin/jinfo:/usr/lib/jvm/openjdk11/bin/jinfo
- jdk:/usr/bin/jjs:/usr/lib/jvm/openjdk11/bin/jjs
- jdk:/usr/bin/jlink:/usr/lib/jvm/openjdk11/bin/jlink
- jdk:/usr/bin/jmap:/usr/lib/jvm/openjdk11/bin/jmap
- jdk:/usr/bin/jmod:/usr/lib/jvm/openjdk11/bin/jmod
- jdk:/usr/bin/jps:/usr/lib/jvm/openjdk11/bin/jps
- jdk:/usr/bin/jrunscript:/usr/lib/jvm/openjdk11/bin/jrunscript
- jdk:/usr/bin/jshell:/usr/lib/jvm/openjdk11/bin/jshell
- jdk:/usr/bin/jstack:/usr/lib/jvm/openjdk11/bin/jstack
- jdk:/usr/bin/jstat:/usr/lib/jvm/openjdk11/bin/jstat
- jdk:/usr/bin/jstatd:/usr/lib/jvm/openjdk11/bin/jstatd
- jdk:/usr/bin/keytool:/usr/lib/jvm/openjdk11/bin/keytool
- jdk:/usr/bin/pack200:/usr/lib/jvm/openjdk11/bin/pack200
- jdk:/usr/bin/rmic:/usr/lib/jvm/openjdk11/bin/rmic
- jdk:/usr/bin/rmid:/usr/lib/jvm/openjdk11/bin/rmid
- jdk:/usr/bin/rmiregistry:/usr/lib/jvm/openjdk11/bin/rmiregistry
- jdk:/usr/bin/serialver:/usr/lib/jvm/openjdk11/bin/serialver
- jdk:/usr/bin/unpack200:/usr/lib/jvm/openjdk11/bin/unpack200
+ jdk:/usr/bin/jaotc:/${_jdk_home}/bin/jaotc
+ jdk:/usr/bin/jar:/${_jdk_home}/bin/jar
+ jdk:/usr/bin/jarsigner:/${_jdk_home}/bin/jarsigner
+ jdk:/usr/bin/java:/${_jdk_home}/bin/java
+ jdk:/usr/bin/javac:/${_jdk_home}/bin/javac
+ jdk:/usr/bin/javadoc:/${_jdk_home}/bin/javadoc
+ jdk:/usr/bin/javap:/${_jdk_home}/bin/javap
+ jdk:/usr/bin/jcmd:/${_jdk_home}/bin/jcmd
+ jdk:/usr/bin/jconsole:/${_jdk_home}/bin/jconsole
+ jdk:/usr/bin/jdb:/${_jdk_home}/bin/jdb
+ jdk:/usr/bin/jdeprscan:/${_jdk_home}/bin/jdeprscan
+ jdk:/usr/bin/jdeps:/${_jdk_home}/bin/jdeps
+ jdk:/usr/bin/jhsdb:/${_jdk_home}/bin/jhsdb
+ jdk:/usr/bin/jimage:/${_jdk_home}/bin/jimage
+ jdk:/usr/bin/jinfo:/${_jdk_home}/bin/jinfo
+ jdk:/usr/bin/jjs:/${_jdk_home}/bin/jjs
+ jdk:/usr/bin/jlink:/${_jdk_home}/bin/jlink
+ jdk:/usr/bin/jmap:/${_jdk_home}/bin/jmap
+ jdk:/usr/bin/jmod:/${_jdk_home}/bin/jmod
+ jdk:/usr/bin/jps:/${_jdk_home}/bin/jps
+ jdk:/usr/bin/jrunscript:/${_jdk_home}/bin/jrunscript
+ jdk:/usr/bin/jshell:/${_jdk_home}/bin/jshell
+ jdk:/usr/bin/jstack:/${_jdk_home}/bin/jstack
+ jdk:/usr/bin/jstat:/${_jdk_home}/bin/jstat
+ jdk:/usr/bin/jstatd:/${_jdk_home}/bin/jstatd
+ jdk:/usr/bin/keytool:/${_jdk_home}/bin/keytool
+ jdk:/usr/bin/pack200:/${_jdk_home}/bin/pack200
+ jdk:/usr/bin/rmic:/${_jdk_home}/bin/rmic
+ jdk:/usr/bin/rmid:/${_jdk_home}/bin/rmid
+ jdk:/usr/bin/rmiregistry:/${_jdk_home}/bin/rmiregistry
+ jdk:/usr/bin/serialver:/${_jdk_home}/bin/serialver
+ jdk:/usr/bin/unpack200:/${_jdk_home}/bin/unpack200
 "
 
 post_extract() {
@@ -151,11 +151,11 @@ do_configure() {
 }
 
 do_install() {
-	vmkdir usr/lib/jvm/openjdk${_java_ver}
-	vcopy build/*-normal-*-release/images/jdk/* "usr/lib/jvm/openjdk${_java_ver}"
-	vmkdir usr/lib/jvm/$_openjdk_version/lib/security
-	make-ca -g -f --destdir "${PWD}/ca" -k "${DESTDIR}/usr/lib/jvm/openjdk${_java_ver}/bin/keytool"
-	mv ./ca/etc/pki/tls/java/cacerts ${DESTDIR}/usr/lib/jvm/openjdk${_java_ver}/lib/security/
+	vmkdir $_jdk_home
+	vcopy build/*-normal-*-release/images/jdk/* $_jdk_home
+	vmkdir $_jdk_home/lib/security
+	make-ca -g -f --destdir "${PWD}/ca" -k $DESTDIR/$_jdk_home/bin/keytool
+	mv ./ca/etc/pki/tls/java/cacerts $DESTDIR/$_jdk_home/lib/security/
 	chmod -R ugo+rw ./ca
 	rm -Rf ./ca
 	vmkdir etc/profile.d
@@ -170,14 +170,14 @@ openjdk11-doc_package() {
 	nostrip=yes
 	noverifyrdeps=yes
 	noshlibprovides=yes
-	short_desc+=" -- documentation"
+	short_desc+=" - documentation"
 	pkg_install() {
 		cd ${wrksrc}
 		if [ "$build_option_docs" ]; then
 			vmkdir usr/share/doc/openjdk11
-			cp -a build/linux-*/images/docs/* ${PKGDESTDIR}/usr/share/doc/openjdk11
+			cp -a build/linux-*/images/docs/* $PKGDESTDIR/usr/share/doc/openjdk11
 		fi
-		vmove usr/lib/jvm/openjdk11/man/man1
+		vmove $_jdk_home/man/man1
 	}
 }
 
@@ -185,17 +185,17 @@ openjdk11-src_package() {
 	nostrip=yes
 	noverifyrdeps=yes
 	noshlibprovides=yes
-	short_desc+=" -- sources"
+	short_desc+=" - sources"
 	pkg_install() {
-		vmove "usr/lib/jvm/openjdk11/lib/src.zip"
+		vmove $_jdk_home/lib/src.zip
 	}
 }
 
 openjdk11-static-libs_package() {
 	notstrip=yes
-	short_desc+=" -- static libs"
+	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}"
+		vmkdir $_jdk_home
+		vcopy build/*-normal-*-release/images/static-libs/lib $_jdk_home
 	}
 }

From d8034a01c7edb853bbde0badc852497a08f2acbb Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Mon, 4 Apr 2022 12:25:32 -0400
Subject: [PATCH 2/4] New package: openjdk11-jre-11.0.12+5.

---
 common/shlibs              | 12 +++++------
 srcpkgs/openjdk11-jre      |  1 +
 srcpkgs/openjdk11/template | 44 ++++++++++++++++++++++++++++++++------
 3 files changed, 44 insertions(+), 13 deletions(-)
 create mode 120000 srcpkgs/openjdk11-jre

diff --git a/common/shlibs b/common/shlibs
index ae4bb44c57a3..458a4c40b16e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1810,12 +1810,12 @@ libawt_xawt.so openjdk8-jre-8u20_1
 libjava.so openjdk8-jre-8u20_1
 libjli.so openjdk8-jre-8u20_1
 libjvm.so openjdk8-jre-8u20_1
-libjawt.so openjdk11-11.0.5+10_1
-libawt.so openjdk11-11.0.5+10_1
-libawt_xawt.so openjdk11-11.0.5+10_1
-libjava.so openjdk11-11.0.5+10_1
-libjli.so openjdk11-11.0.5+10_1
-libjvm.so openjdk11-11.0.5+10_1
+libjawt.so openjdk11-jre-11.0.5+10_1
+libawt.so openjdk11-jre-11.0.5+10_1
+libawt_xawt.so openjdk11-jre-11.0.5+10_1
+libjava.so openjdk11-jre-11.0.5+10_1
+libjli.so openjdk11-jre-11.0.5+10_1
+libjvm.so openjdk11-jre-11.0.5+10_1
 libjawt.so openjdk7-bootstrap-7u221b02_1
 libawt.so openjdk7-bootstrap-7u221b02_1
 libawt_xawt.so openjdk7-bootstrap-7u221b02_1
diff --git a/srcpkgs/openjdk11-jre b/srcpkgs/openjdk11-jre
new file mode 120000
index 000000000000..8213494c49ed
--- /dev/null
+++ b/srcpkgs/openjdk11-jre
@@ -0,0 +1 @@
+openjdk11
\ No newline at end of file
diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index 2c670d92ee1d..a2cc31c85aea 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -31,15 +31,14 @@ hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
 makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
  fontconfig-devel zlib-devel lcms2-devel"
-depends="fontconfig"
+depends="${pkgname}-jre-${version}_${revision}"
 short_desc="OpenJDK Java Development Kit"
 maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="GPL-2.0-only WITH Classpath-exception-2.0"
 homepage="http://openjdk.java.net/"
 distfiles="https://hg.openjdk.java.net/jdk-updates/jdk${_java_ver}u/archive/jdk-${version}.tar.gz"
 checksum=ff0edaf800c76ae435840365a9205a5f7277a5a2fd3c79ad874522a15c213559
-provides="java-environment-${version}_1 java-runtime-${version}_1"
-shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so"
+provides="java-environment-${version}_1"
 
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes
@@ -158,14 +157,45 @@ do_install() {
 	mv ./ca/etc/pki/tls/java/cacerts $DESTDIR/$_jdk_home/lib/security/
 	chmod -R ugo+rw ./ca
 	rm -Rf ./ca
-	vmkdir etc/profile.d
-	cat >>${DESTDIR}/etc/profile.d/10_openjdk11.sh <<EOF
-export JAVA_HOME=\${JAVA_HOME=/usr/lib/jvm/openjdk${_java_ver}}
-EOF
 	vlicense ASSEMBLY_EXCEPTION
 	vlicense LICENSE
 }
 
+subpackages="openjdk11-src openjdk11-jre openjdk11-doc openjdk11-static-libs"
+
+openjdk11-jre_package() {
+	shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so"
+	short_desc+=" - runtime components"
+	provides="java-runtime-${version}_1"
+	depends="fontconfig"
+	alternatives="
+	 java:/usr/bin/java:/${_jdk_home}/bin/java
+	 java:/usr/bin/jjs:/${_jdk_home}/bin/jjs
+	 java:/usr/bin/keytool:/${_jdk_home}/bin/keytool
+	 java:/usr/bin/pack200:/${_jdk_home}/bin/pack200
+	 java:/usr/bin/rmid:/${_jdk_home}/bin/rmid
+	 java:/usr/bin/rmiregistry:/${_jdk_home}/bin/rmiregistry
+	 java:/usr/bin/unpack200:/${_jdk_home}/bin/unpack200
+	"
+	pkg_install() {
+		for bf in java jjs keytool pack200 rmid rmiregistry unpack200; do
+			vmove $_jdk_home/bin/$bf
+		done
+
+		for f in lib legal conf release; do
+			vmove $_jdk_home/$f
+		done
+
+		vmkdir etc/profile.d
+		cat >>${PKGDESTDIR}/etc/profile.d/10_openjdk11.sh <<EOF
+export JAVA_HOME=\${JAVA_HOME=/usr/lib/jvm/openjdk${_java_ver}}
+EOF
+
+		vlicense ASSEMBLY_EXCEPTION
+		vlicense LICENSE
+	}
+}
+
 openjdk11-doc_package() {
 	nostrip=yes
 	noverifyrdeps=yes

From a7a688a958801cea2412ab2b08a6d01892023d91 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 20 Apr 2022 19:53:06 -0400
Subject: [PATCH 3/4] New package: openjdk11-jmods-11.0.12+5

fixes #25183
---
 srcpkgs/openjdk11-jmods    |  1 +
 srcpkgs/openjdk11/template | 10 +++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/openjdk11-jmods

diff --git a/srcpkgs/openjdk11-jmods b/srcpkgs/openjdk11-jmods
new file mode 120000
index 000000000000..8213494c49ed
--- /dev/null
+++ b/srcpkgs/openjdk11-jmods
@@ -0,0 +1 @@
+openjdk11
\ No newline at end of file
diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index a2cc31c85aea..371baf17b1bb 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -161,7 +161,7 @@ do_install() {
 	vlicense LICENSE
 }
 
-subpackages="openjdk11-src openjdk11-jre openjdk11-doc openjdk11-static-libs"
+subpackages="openjdk11-src openjdk11-jre openjdk11-doc openjdk11-jmods openjdk11-static-libs"
 
 openjdk11-jre_package() {
 	shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so"
@@ -229,3 +229,11 @@ openjdk11-static-libs_package() {
 		vcopy build/*-normal-*-release/images/static-libs/lib $_jdk_home
 	}
 }
+
+openjdk11-jmods_package() {
+	short_desc+=" - JMODs"
+	depends="${pkgname}-${version}_${revision}"
+	pkg_install() {
+		vmove $_jdk_home/jmods
+	}
+}

From 9909030debc7d8ae5c090036464411c838dbffd4 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 20 Apr 2022 20:14:58 -0400
Subject: [PATCH 4/4] openjdk11: update to 11.0.12+7.

---
 srcpkgs/openjdk11/template | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index 371baf17b1bb..ab547257f0cb 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=3
+version=11.0.12+7
+revision=1
 _java_ver="${version%%.*}"
 _jdk_home="usr/lib/jvm/openjdk${_java_ver}"
 wrksrc="jdk${_java_ver}u-jdk-${version}"
@@ -16,14 +16,14 @@ configure_args="
  --with-libpng=system
  --with-lcms=system
  --with-jtreg=no
- --with-native-debug-symbols=none
+ --with-native-debug-symbols=internal
  --with-version-pre=
- --with-version-opt="void-r$revision"
+ --with-version-opt=void-r$revision
  --with-version-build=${version#*+}
- --with-vendor-name="Void"
- --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""
+ --with-vendor-name=Void
+ --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 static-libs-image $(vopt_if docs docs)"
 make_check_target="test-hotspot-gtest"
 hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
@@ -37,7 +37,7 @@ maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="GPL-2.0-only WITH Classpath-exception-2.0"
 homepage="http://openjdk.java.net/"
 distfiles="https://hg.openjdk.java.net/jdk-updates/jdk${_java_ver}u/archive/jdk-${version}.tar.gz"
-checksum=ff0edaf800c76ae435840365a9205a5f7277a5a2fd3c79ad874522a15c213559
+checksum=06ad7b39625374c30a8d8be9e7e18f37663ba6fe44c2a66aa7b7987b140d069a
 provides="java-environment-${version}_1"
 
 # Build is still parallel, but don't use -jN.
@@ -71,14 +71,6 @@ else
 fi
 
 alternatives="
- java:/usr/bin/java:/${_jdk_home}/bin/java
- java:/usr/bin/jjs:/${_jdk_home}/bin/jjs
- java:/usr/bin/keytool:/${_jdk_home}/bin/keytool
- java:/usr/bin/pack200:/${_jdk_home}/bin/pack200
- java:/usr/bin/rmid:/${_jdk_home}/bin/rmid
- java:/usr/bin/rmiregistry:/${_jdk_home}/bin/rmiregistry
- java:/usr/bin/unpack200:/${_jdk_home}/bin/unpack200
-
  jdk:/usr/bin/jaotc:/${_jdk_home}/bin/jaotc
  jdk:/usr/bin/jar:/${_jdk_home}/bin/jar
  jdk:/usr/bin/jarsigner:/${_jdk_home}/bin/jarsigner

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PR PATCH] [Updated] openjdk11: update to 11.0.12+7, cleanup, split jre & jmods into subpkgs
  2022-04-04 16:29 [PR PATCH] openjdk11: cleanup, split jre into subpackage classabbyamp
                   ` (8 preceding siblings ...)
  2022-04-21  0:15 ` [PR PATCH] [Updated] openjdk11: cleanup, split jre, jmods " classabbyamp
@ 2022-04-21  1:25 ` classabbyamp
  2022-04-21  1:28 ` classabbyamp
                   ` (7 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: classabbyamp @ 2022-04-21  1:25 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1685 bytes --]

There is an updated pull request by classabbyamp against master on the void-packages repository

https://github.com/classabbyamp/void-packages openjdk11-cleanup
https://github.com/void-linux/void-packages/pull/36520

openjdk11: update to 11.0.12+7, cleanup, split jre & jmods into subpkgs
- openjdk11: clean up template
- New package: openjdk11-jre-11.0.12+5
- New package: openjdk11-jmods-11.0.12+5
- openjdk11: update to 11.0.12+7.

fixes #25183
closes #36221

This should bring openjdk11 more in-line with other openjdk package templates

cc: @knusbaum for maintainer review

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

CI fail on aarch64 and armv7l for unresolvable shlibs can be safely ignored.

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/36520.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openjdk11-cleanup-36520.patch --]
[-- Type: text/x-diff, Size: 16115 bytes --]

From ee41720b7a32b17dc42578c48ac10ac5404408ca Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Mon, 4 Apr 2022 12:15:17 -0400
Subject: [PATCH 1/5] openjdk11: clean up template

---
 srcpkgs/openjdk11/template | 110 ++++++++++++++++++-------------------
 1 file changed, 55 insertions(+), 55 deletions(-)

diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index bd38c0c5c010..2c670d92ee1d 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -1,9 +1,9 @@
 # Template file for 'openjdk11'
 pkgname=openjdk11
 version=11.0.12+5
-revision=2
+revision=3
 _java_ver="${version%%.*}"
-_openjdk_version="openjdk-${_java_ver}"
+_jdk_home="usr/lib/jvm/openjdk${_java_ver}"
 wrksrc="jdk${_java_ver}u-jdk-${version}"
 build_style=gnu-configure
 configure_args="
@@ -68,50 +68,50 @@ if [ ! "$CROSS_BUILD" ]; then
 	configure_args+=" --with-boot-jdk=/usr/lib/jvm/java-10-openjdk"
 else
 	hostmakedepends+=" openjdk11"
-	configure_args+=" --with-boot-jdk=/usr/lib/jvm/openjdk11"
+	configure_args+=" --with-boot-jdk=/${_jdk_home}"
 fi
 
 alternatives="
- java:/usr/bin/java:/usr/lib/jvm/openjdk11/bin/java
- java:/usr/bin/jjs:/usr/lib/jvm/openjdk11/bin/jjs
- java:/usr/bin/keytool:/usr/lib/jvm/openjdk11/bin/keytool
- java:/usr/bin/pack200:/usr/lib/jvm/openjdk11/bin/pack200
- java:/usr/bin/rmid:/usr/lib/jvm/openjdk11/bin/rmid
- java:/usr/bin/rmiregistry:/usr/lib/jvm/openjdk11/bin/rmiregistry
- java:/usr/bin/unpack200:/usr/lib/jvm/openjdk11/bin/unpack200
+ java:/usr/bin/java:/${_jdk_home}/bin/java
+ java:/usr/bin/jjs:/${_jdk_home}/bin/jjs
+ java:/usr/bin/keytool:/${_jdk_home}/bin/keytool
+ java:/usr/bin/pack200:/${_jdk_home}/bin/pack200
+ java:/usr/bin/rmid:/${_jdk_home}/bin/rmid
+ java:/usr/bin/rmiregistry:/${_jdk_home}/bin/rmiregistry
+ java:/usr/bin/unpack200:/${_jdk_home}/bin/unpack200
 
- jdk:/usr/bin/jaotc:/usr/lib/jvm/openjdk11/bin/jaotc
- jdk:/usr/bin/jar:/usr/lib/jvm/openjdk11/bin/jar
- jdk:/usr/bin/jarsigner:/usr/lib/jvm/openjdk11/bin/jarsigner
- jdk:/usr/bin/java:/usr/lib/jvm/openjdk11/bin/java
- jdk:/usr/bin/javac:/usr/lib/jvm/openjdk11/bin/javac
- jdk:/usr/bin/javadoc:/usr/lib/jvm/openjdk11/bin/javadoc
- jdk:/usr/bin/javap:/usr/lib/jvm/openjdk11/bin/javap
- jdk:/usr/bin/jcmd:/usr/lib/jvm/openjdk11/bin/jcmd
- jdk:/usr/bin/jconsole:/usr/lib/jvm/openjdk11/bin/jconsole
- jdk:/usr/bin/jdb:/usr/lib/jvm/openjdk11/bin/jdb
- jdk:/usr/bin/jdeprscan:/usr/lib/jvm/openjdk11/bin/jdeprscan
- jdk:/usr/bin/jdeps:/usr/lib/jvm/openjdk11/bin/jdeps
- jdk:/usr/bin/jhsdb:/usr/lib/jvm/openjdk11/bin/jhsdb
- jdk:/usr/bin/jimage:/usr/lib/jvm/openjdk11/bin/jimage
- jdk:/usr/bin/jinfo:/usr/lib/jvm/openjdk11/bin/jinfo
- jdk:/usr/bin/jjs:/usr/lib/jvm/openjdk11/bin/jjs
- jdk:/usr/bin/jlink:/usr/lib/jvm/openjdk11/bin/jlink
- jdk:/usr/bin/jmap:/usr/lib/jvm/openjdk11/bin/jmap
- jdk:/usr/bin/jmod:/usr/lib/jvm/openjdk11/bin/jmod
- jdk:/usr/bin/jps:/usr/lib/jvm/openjdk11/bin/jps
- jdk:/usr/bin/jrunscript:/usr/lib/jvm/openjdk11/bin/jrunscript
- jdk:/usr/bin/jshell:/usr/lib/jvm/openjdk11/bin/jshell
- jdk:/usr/bin/jstack:/usr/lib/jvm/openjdk11/bin/jstack
- jdk:/usr/bin/jstat:/usr/lib/jvm/openjdk11/bin/jstat
- jdk:/usr/bin/jstatd:/usr/lib/jvm/openjdk11/bin/jstatd
- jdk:/usr/bin/keytool:/usr/lib/jvm/openjdk11/bin/keytool
- jdk:/usr/bin/pack200:/usr/lib/jvm/openjdk11/bin/pack200
- jdk:/usr/bin/rmic:/usr/lib/jvm/openjdk11/bin/rmic
- jdk:/usr/bin/rmid:/usr/lib/jvm/openjdk11/bin/rmid
- jdk:/usr/bin/rmiregistry:/usr/lib/jvm/openjdk11/bin/rmiregistry
- jdk:/usr/bin/serialver:/usr/lib/jvm/openjdk11/bin/serialver
- jdk:/usr/bin/unpack200:/usr/lib/jvm/openjdk11/bin/unpack200
+ jdk:/usr/bin/jaotc:/${_jdk_home}/bin/jaotc
+ jdk:/usr/bin/jar:/${_jdk_home}/bin/jar
+ jdk:/usr/bin/jarsigner:/${_jdk_home}/bin/jarsigner
+ jdk:/usr/bin/java:/${_jdk_home}/bin/java
+ jdk:/usr/bin/javac:/${_jdk_home}/bin/javac
+ jdk:/usr/bin/javadoc:/${_jdk_home}/bin/javadoc
+ jdk:/usr/bin/javap:/${_jdk_home}/bin/javap
+ jdk:/usr/bin/jcmd:/${_jdk_home}/bin/jcmd
+ jdk:/usr/bin/jconsole:/${_jdk_home}/bin/jconsole
+ jdk:/usr/bin/jdb:/${_jdk_home}/bin/jdb
+ jdk:/usr/bin/jdeprscan:/${_jdk_home}/bin/jdeprscan
+ jdk:/usr/bin/jdeps:/${_jdk_home}/bin/jdeps
+ jdk:/usr/bin/jhsdb:/${_jdk_home}/bin/jhsdb
+ jdk:/usr/bin/jimage:/${_jdk_home}/bin/jimage
+ jdk:/usr/bin/jinfo:/${_jdk_home}/bin/jinfo
+ jdk:/usr/bin/jjs:/${_jdk_home}/bin/jjs
+ jdk:/usr/bin/jlink:/${_jdk_home}/bin/jlink
+ jdk:/usr/bin/jmap:/${_jdk_home}/bin/jmap
+ jdk:/usr/bin/jmod:/${_jdk_home}/bin/jmod
+ jdk:/usr/bin/jps:/${_jdk_home}/bin/jps
+ jdk:/usr/bin/jrunscript:/${_jdk_home}/bin/jrunscript
+ jdk:/usr/bin/jshell:/${_jdk_home}/bin/jshell
+ jdk:/usr/bin/jstack:/${_jdk_home}/bin/jstack
+ jdk:/usr/bin/jstat:/${_jdk_home}/bin/jstat
+ jdk:/usr/bin/jstatd:/${_jdk_home}/bin/jstatd
+ jdk:/usr/bin/keytool:/${_jdk_home}/bin/keytool
+ jdk:/usr/bin/pack200:/${_jdk_home}/bin/pack200
+ jdk:/usr/bin/rmic:/${_jdk_home}/bin/rmic
+ jdk:/usr/bin/rmid:/${_jdk_home}/bin/rmid
+ jdk:/usr/bin/rmiregistry:/${_jdk_home}/bin/rmiregistry
+ jdk:/usr/bin/serialver:/${_jdk_home}/bin/serialver
+ jdk:/usr/bin/unpack200:/${_jdk_home}/bin/unpack200
 "
 
 post_extract() {
@@ -151,11 +151,11 @@ do_configure() {
 }
 
 do_install() {
-	vmkdir usr/lib/jvm/openjdk${_java_ver}
-	vcopy build/*-normal-*-release/images/jdk/* "usr/lib/jvm/openjdk${_java_ver}"
-	vmkdir usr/lib/jvm/$_openjdk_version/lib/security
-	make-ca -g -f --destdir "${PWD}/ca" -k "${DESTDIR}/usr/lib/jvm/openjdk${_java_ver}/bin/keytool"
-	mv ./ca/etc/pki/tls/java/cacerts ${DESTDIR}/usr/lib/jvm/openjdk${_java_ver}/lib/security/
+	vmkdir $_jdk_home
+	vcopy build/*-normal-*-release/images/jdk/* $_jdk_home
+	vmkdir $_jdk_home/lib/security
+	make-ca -g -f --destdir "${PWD}/ca" -k $DESTDIR/$_jdk_home/bin/keytool
+	mv ./ca/etc/pki/tls/java/cacerts $DESTDIR/$_jdk_home/lib/security/
 	chmod -R ugo+rw ./ca
 	rm -Rf ./ca
 	vmkdir etc/profile.d
@@ -170,14 +170,14 @@ openjdk11-doc_package() {
 	nostrip=yes
 	noverifyrdeps=yes
 	noshlibprovides=yes
-	short_desc+=" -- documentation"
+	short_desc+=" - documentation"
 	pkg_install() {
 		cd ${wrksrc}
 		if [ "$build_option_docs" ]; then
 			vmkdir usr/share/doc/openjdk11
-			cp -a build/linux-*/images/docs/* ${PKGDESTDIR}/usr/share/doc/openjdk11
+			cp -a build/linux-*/images/docs/* $PKGDESTDIR/usr/share/doc/openjdk11
 		fi
-		vmove usr/lib/jvm/openjdk11/man/man1
+		vmove $_jdk_home/man/man1
 	}
 }
 
@@ -185,17 +185,17 @@ openjdk11-src_package() {
 	nostrip=yes
 	noverifyrdeps=yes
 	noshlibprovides=yes
-	short_desc+=" -- sources"
+	short_desc+=" - sources"
 	pkg_install() {
-		vmove "usr/lib/jvm/openjdk11/lib/src.zip"
+		vmove $_jdk_home/lib/src.zip
 	}
 }
 
 openjdk11-static-libs_package() {
 	notstrip=yes
-	short_desc+=" -- static libs"
+	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}"
+		vmkdir $_jdk_home
+		vcopy build/*-normal-*-release/images/static-libs/lib $_jdk_home
 	}
 }

From d8034a01c7edb853bbde0badc852497a08f2acbb Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Mon, 4 Apr 2022 12:25:32 -0400
Subject: [PATCH 2/5] New package: openjdk11-jre-11.0.12+5.

---
 common/shlibs              | 12 +++++------
 srcpkgs/openjdk11-jre      |  1 +
 srcpkgs/openjdk11/template | 44 ++++++++++++++++++++++++++++++++------
 3 files changed, 44 insertions(+), 13 deletions(-)
 create mode 120000 srcpkgs/openjdk11-jre

diff --git a/common/shlibs b/common/shlibs
index ae4bb44c57a3..458a4c40b16e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1810,12 +1810,12 @@ libawt_xawt.so openjdk8-jre-8u20_1
 libjava.so openjdk8-jre-8u20_1
 libjli.so openjdk8-jre-8u20_1
 libjvm.so openjdk8-jre-8u20_1
-libjawt.so openjdk11-11.0.5+10_1
-libawt.so openjdk11-11.0.5+10_1
-libawt_xawt.so openjdk11-11.0.5+10_1
-libjava.so openjdk11-11.0.5+10_1
-libjli.so openjdk11-11.0.5+10_1
-libjvm.so openjdk11-11.0.5+10_1
+libjawt.so openjdk11-jre-11.0.5+10_1
+libawt.so openjdk11-jre-11.0.5+10_1
+libawt_xawt.so openjdk11-jre-11.0.5+10_1
+libjava.so openjdk11-jre-11.0.5+10_1
+libjli.so openjdk11-jre-11.0.5+10_1
+libjvm.so openjdk11-jre-11.0.5+10_1
 libjawt.so openjdk7-bootstrap-7u221b02_1
 libawt.so openjdk7-bootstrap-7u221b02_1
 libawt_xawt.so openjdk7-bootstrap-7u221b02_1
diff --git a/srcpkgs/openjdk11-jre b/srcpkgs/openjdk11-jre
new file mode 120000
index 000000000000..8213494c49ed
--- /dev/null
+++ b/srcpkgs/openjdk11-jre
@@ -0,0 +1 @@
+openjdk11
\ No newline at end of file
diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index 2c670d92ee1d..a2cc31c85aea 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -31,15 +31,14 @@ hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
 makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
  fontconfig-devel zlib-devel lcms2-devel"
-depends="fontconfig"
+depends="${pkgname}-jre-${version}_${revision}"
 short_desc="OpenJDK Java Development Kit"
 maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="GPL-2.0-only WITH Classpath-exception-2.0"
 homepage="http://openjdk.java.net/"
 distfiles="https://hg.openjdk.java.net/jdk-updates/jdk${_java_ver}u/archive/jdk-${version}.tar.gz"
 checksum=ff0edaf800c76ae435840365a9205a5f7277a5a2fd3c79ad874522a15c213559
-provides="java-environment-${version}_1 java-runtime-${version}_1"
-shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so"
+provides="java-environment-${version}_1"
 
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes
@@ -158,14 +157,45 @@ do_install() {
 	mv ./ca/etc/pki/tls/java/cacerts $DESTDIR/$_jdk_home/lib/security/
 	chmod -R ugo+rw ./ca
 	rm -Rf ./ca
-	vmkdir etc/profile.d
-	cat >>${DESTDIR}/etc/profile.d/10_openjdk11.sh <<EOF
-export JAVA_HOME=\${JAVA_HOME=/usr/lib/jvm/openjdk${_java_ver}}
-EOF
 	vlicense ASSEMBLY_EXCEPTION
 	vlicense LICENSE
 }
 
+subpackages="openjdk11-src openjdk11-jre openjdk11-doc openjdk11-static-libs"
+
+openjdk11-jre_package() {
+	shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so"
+	short_desc+=" - runtime components"
+	provides="java-runtime-${version}_1"
+	depends="fontconfig"
+	alternatives="
+	 java:/usr/bin/java:/${_jdk_home}/bin/java
+	 java:/usr/bin/jjs:/${_jdk_home}/bin/jjs
+	 java:/usr/bin/keytool:/${_jdk_home}/bin/keytool
+	 java:/usr/bin/pack200:/${_jdk_home}/bin/pack200
+	 java:/usr/bin/rmid:/${_jdk_home}/bin/rmid
+	 java:/usr/bin/rmiregistry:/${_jdk_home}/bin/rmiregistry
+	 java:/usr/bin/unpack200:/${_jdk_home}/bin/unpack200
+	"
+	pkg_install() {
+		for bf in java jjs keytool pack200 rmid rmiregistry unpack200; do
+			vmove $_jdk_home/bin/$bf
+		done
+
+		for f in lib legal conf release; do
+			vmove $_jdk_home/$f
+		done
+
+		vmkdir etc/profile.d
+		cat >>${PKGDESTDIR}/etc/profile.d/10_openjdk11.sh <<EOF
+export JAVA_HOME=\${JAVA_HOME=/usr/lib/jvm/openjdk${_java_ver}}
+EOF
+
+		vlicense ASSEMBLY_EXCEPTION
+		vlicense LICENSE
+	}
+}
+
 openjdk11-doc_package() {
 	nostrip=yes
 	noverifyrdeps=yes

From a7a688a958801cea2412ab2b08a6d01892023d91 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 20 Apr 2022 19:53:06 -0400
Subject: [PATCH 3/5] New package: openjdk11-jmods-11.0.12+5

fixes #25183
---
 srcpkgs/openjdk11-jmods    |  1 +
 srcpkgs/openjdk11/template | 10 +++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/openjdk11-jmods

diff --git a/srcpkgs/openjdk11-jmods b/srcpkgs/openjdk11-jmods
new file mode 120000
index 000000000000..8213494c49ed
--- /dev/null
+++ b/srcpkgs/openjdk11-jmods
@@ -0,0 +1 @@
+openjdk11
\ No newline at end of file
diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index a2cc31c85aea..371baf17b1bb 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -161,7 +161,7 @@ do_install() {
 	vlicense LICENSE
 }
 
-subpackages="openjdk11-src openjdk11-jre openjdk11-doc openjdk11-static-libs"
+subpackages="openjdk11-src openjdk11-jre openjdk11-doc openjdk11-jmods openjdk11-static-libs"
 
 openjdk11-jre_package() {
 	shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so"
@@ -229,3 +229,11 @@ openjdk11-static-libs_package() {
 		vcopy build/*-normal-*-release/images/static-libs/lib $_jdk_home
 	}
 }
+
+openjdk11-jmods_package() {
+	short_desc+=" - JMODs"
+	depends="${pkgname}-${version}_${revision}"
+	pkg_install() {
+		vmove $_jdk_home/jmods
+	}
+}

From 27380daab5bc23cdd6a522ca44492b72264458c4 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 20 Apr 2022 21:24:39 -0400
Subject: [PATCH 4/5] openjdk11: disable on armv[56]*

fixes #29457
---
 srcpkgs/openjdk11/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index 371baf17b1bb..bba3b98007ee 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -44,10 +44,11 @@ provides="java-environment-${version}_1"
 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

From 86c0a5f9cdf5db490b6a6e44bf1902ac68001932 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 20 Apr 2022 20:14:58 -0400
Subject: [PATCH 5/5] openjdk11: update to 11.0.12+7.

---
 srcpkgs/openjdk11/template | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index bba3b98007ee..90883afd236c 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=3
+version=11.0.12+7
+revision=1
 _java_ver="${version%%.*}"
 _jdk_home="usr/lib/jvm/openjdk${_java_ver}"
 wrksrc="jdk${_java_ver}u-jdk-${version}"
@@ -16,14 +16,14 @@ configure_args="
  --with-libpng=system
  --with-lcms=system
  --with-jtreg=no
- --with-native-debug-symbols=none
+ --with-native-debug-symbols=internal
  --with-version-pre=
- --with-version-opt="void-r$revision"
+ --with-version-opt=void-r$revision
  --with-version-build=${version#*+}
- --with-vendor-name="Void"
- --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""
+ --with-vendor-name=Void
+ --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 static-libs-image $(vopt_if docs docs)"
 make_check_target="test-hotspot-gtest"
 hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
@@ -37,7 +37,7 @@ maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="GPL-2.0-only WITH Classpath-exception-2.0"
 homepage="http://openjdk.java.net/"
 distfiles="https://hg.openjdk.java.net/jdk-updates/jdk${_java_ver}u/archive/jdk-${version}.tar.gz"
-checksum=ff0edaf800c76ae435840365a9205a5f7277a5a2fd3c79ad874522a15c213559
+checksum=06ad7b39625374c30a8d8be9e7e18f37663ba6fe44c2a66aa7b7987b140d069a
 provides="java-environment-${version}_1"
 
 # Build is still parallel, but don't use -jN.
@@ -72,14 +72,6 @@ else
 fi
 
 alternatives="
- java:/usr/bin/java:/${_jdk_home}/bin/java
- java:/usr/bin/jjs:/${_jdk_home}/bin/jjs
- java:/usr/bin/keytool:/${_jdk_home}/bin/keytool
- java:/usr/bin/pack200:/${_jdk_home}/bin/pack200
- java:/usr/bin/rmid:/${_jdk_home}/bin/rmid
- java:/usr/bin/rmiregistry:/${_jdk_home}/bin/rmiregistry
- java:/usr/bin/unpack200:/${_jdk_home}/bin/unpack200
-
  jdk:/usr/bin/jaotc:/${_jdk_home}/bin/jaotc
  jdk:/usr/bin/jar:/${_jdk_home}/bin/jar
  jdk:/usr/bin/jarsigner:/${_jdk_home}/bin/jarsigner

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PR PATCH] [Updated] openjdk11: update to 11.0.12+7, cleanup, split jre & jmods into subpkgs
  2022-04-04 16:29 [PR PATCH] openjdk11: cleanup, split jre into subpackage classabbyamp
                   ` (9 preceding siblings ...)
  2022-04-21  1:25 ` [PR PATCH] [Updated] openjdk11: update to 11.0.12+7, cleanup, split jre & jmods into subpkgs classabbyamp
@ 2022-04-21  1:28 ` classabbyamp
  2022-04-21  3:31 ` classabbyamp
                   ` (6 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: classabbyamp @ 2022-04-21  1:28 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1705 bytes --]

There is an updated pull request by classabbyamp against master on the void-packages repository

https://github.com/classabbyamp/void-packages openjdk11-cleanup
https://github.com/void-linux/void-packages/pull/36520

openjdk11: update to 11.0.12+7, cleanup, split jre & jmods into subpkgs
- openjdk11: clean up template
- New package: openjdk11-jre-11.0.12+5
- New package: openjdk11-jmods-11.0.12+5
- openjdk11: update to 11.0.12+7.

fixes #25183
fixes #29457
closes #36221

This should bring openjdk11 more in-line with other openjdk package templates

cc: @knusbaum for maintainer review

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

CI fail on aarch64 and armv7l glibc for unresolvable shlibs can be safely ignored.

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/36520.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openjdk11-cleanup-36520.patch --]
[-- Type: text/x-diff, Size: 16129 bytes --]

From ee41720b7a32b17dc42578c48ac10ac5404408ca Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Mon, 4 Apr 2022 12:15:17 -0400
Subject: [PATCH 1/5] openjdk11: clean up template

---
 srcpkgs/openjdk11/template | 110 ++++++++++++++++++-------------------
 1 file changed, 55 insertions(+), 55 deletions(-)

diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index bd38c0c5c010..2c670d92ee1d 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -1,9 +1,9 @@
 # Template file for 'openjdk11'
 pkgname=openjdk11
 version=11.0.12+5
-revision=2
+revision=3
 _java_ver="${version%%.*}"
-_openjdk_version="openjdk-${_java_ver}"
+_jdk_home="usr/lib/jvm/openjdk${_java_ver}"
 wrksrc="jdk${_java_ver}u-jdk-${version}"
 build_style=gnu-configure
 configure_args="
@@ -68,50 +68,50 @@ if [ ! "$CROSS_BUILD" ]; then
 	configure_args+=" --with-boot-jdk=/usr/lib/jvm/java-10-openjdk"
 else
 	hostmakedepends+=" openjdk11"
-	configure_args+=" --with-boot-jdk=/usr/lib/jvm/openjdk11"
+	configure_args+=" --with-boot-jdk=/${_jdk_home}"
 fi
 
 alternatives="
- java:/usr/bin/java:/usr/lib/jvm/openjdk11/bin/java
- java:/usr/bin/jjs:/usr/lib/jvm/openjdk11/bin/jjs
- java:/usr/bin/keytool:/usr/lib/jvm/openjdk11/bin/keytool
- java:/usr/bin/pack200:/usr/lib/jvm/openjdk11/bin/pack200
- java:/usr/bin/rmid:/usr/lib/jvm/openjdk11/bin/rmid
- java:/usr/bin/rmiregistry:/usr/lib/jvm/openjdk11/bin/rmiregistry
- java:/usr/bin/unpack200:/usr/lib/jvm/openjdk11/bin/unpack200
+ java:/usr/bin/java:/${_jdk_home}/bin/java
+ java:/usr/bin/jjs:/${_jdk_home}/bin/jjs
+ java:/usr/bin/keytool:/${_jdk_home}/bin/keytool
+ java:/usr/bin/pack200:/${_jdk_home}/bin/pack200
+ java:/usr/bin/rmid:/${_jdk_home}/bin/rmid
+ java:/usr/bin/rmiregistry:/${_jdk_home}/bin/rmiregistry
+ java:/usr/bin/unpack200:/${_jdk_home}/bin/unpack200
 
- jdk:/usr/bin/jaotc:/usr/lib/jvm/openjdk11/bin/jaotc
- jdk:/usr/bin/jar:/usr/lib/jvm/openjdk11/bin/jar
- jdk:/usr/bin/jarsigner:/usr/lib/jvm/openjdk11/bin/jarsigner
- jdk:/usr/bin/java:/usr/lib/jvm/openjdk11/bin/java
- jdk:/usr/bin/javac:/usr/lib/jvm/openjdk11/bin/javac
- jdk:/usr/bin/javadoc:/usr/lib/jvm/openjdk11/bin/javadoc
- jdk:/usr/bin/javap:/usr/lib/jvm/openjdk11/bin/javap
- jdk:/usr/bin/jcmd:/usr/lib/jvm/openjdk11/bin/jcmd
- jdk:/usr/bin/jconsole:/usr/lib/jvm/openjdk11/bin/jconsole
- jdk:/usr/bin/jdb:/usr/lib/jvm/openjdk11/bin/jdb
- jdk:/usr/bin/jdeprscan:/usr/lib/jvm/openjdk11/bin/jdeprscan
- jdk:/usr/bin/jdeps:/usr/lib/jvm/openjdk11/bin/jdeps
- jdk:/usr/bin/jhsdb:/usr/lib/jvm/openjdk11/bin/jhsdb
- jdk:/usr/bin/jimage:/usr/lib/jvm/openjdk11/bin/jimage
- jdk:/usr/bin/jinfo:/usr/lib/jvm/openjdk11/bin/jinfo
- jdk:/usr/bin/jjs:/usr/lib/jvm/openjdk11/bin/jjs
- jdk:/usr/bin/jlink:/usr/lib/jvm/openjdk11/bin/jlink
- jdk:/usr/bin/jmap:/usr/lib/jvm/openjdk11/bin/jmap
- jdk:/usr/bin/jmod:/usr/lib/jvm/openjdk11/bin/jmod
- jdk:/usr/bin/jps:/usr/lib/jvm/openjdk11/bin/jps
- jdk:/usr/bin/jrunscript:/usr/lib/jvm/openjdk11/bin/jrunscript
- jdk:/usr/bin/jshell:/usr/lib/jvm/openjdk11/bin/jshell
- jdk:/usr/bin/jstack:/usr/lib/jvm/openjdk11/bin/jstack
- jdk:/usr/bin/jstat:/usr/lib/jvm/openjdk11/bin/jstat
- jdk:/usr/bin/jstatd:/usr/lib/jvm/openjdk11/bin/jstatd
- jdk:/usr/bin/keytool:/usr/lib/jvm/openjdk11/bin/keytool
- jdk:/usr/bin/pack200:/usr/lib/jvm/openjdk11/bin/pack200
- jdk:/usr/bin/rmic:/usr/lib/jvm/openjdk11/bin/rmic
- jdk:/usr/bin/rmid:/usr/lib/jvm/openjdk11/bin/rmid
- jdk:/usr/bin/rmiregistry:/usr/lib/jvm/openjdk11/bin/rmiregistry
- jdk:/usr/bin/serialver:/usr/lib/jvm/openjdk11/bin/serialver
- jdk:/usr/bin/unpack200:/usr/lib/jvm/openjdk11/bin/unpack200
+ jdk:/usr/bin/jaotc:/${_jdk_home}/bin/jaotc
+ jdk:/usr/bin/jar:/${_jdk_home}/bin/jar
+ jdk:/usr/bin/jarsigner:/${_jdk_home}/bin/jarsigner
+ jdk:/usr/bin/java:/${_jdk_home}/bin/java
+ jdk:/usr/bin/javac:/${_jdk_home}/bin/javac
+ jdk:/usr/bin/javadoc:/${_jdk_home}/bin/javadoc
+ jdk:/usr/bin/javap:/${_jdk_home}/bin/javap
+ jdk:/usr/bin/jcmd:/${_jdk_home}/bin/jcmd
+ jdk:/usr/bin/jconsole:/${_jdk_home}/bin/jconsole
+ jdk:/usr/bin/jdb:/${_jdk_home}/bin/jdb
+ jdk:/usr/bin/jdeprscan:/${_jdk_home}/bin/jdeprscan
+ jdk:/usr/bin/jdeps:/${_jdk_home}/bin/jdeps
+ jdk:/usr/bin/jhsdb:/${_jdk_home}/bin/jhsdb
+ jdk:/usr/bin/jimage:/${_jdk_home}/bin/jimage
+ jdk:/usr/bin/jinfo:/${_jdk_home}/bin/jinfo
+ jdk:/usr/bin/jjs:/${_jdk_home}/bin/jjs
+ jdk:/usr/bin/jlink:/${_jdk_home}/bin/jlink
+ jdk:/usr/bin/jmap:/${_jdk_home}/bin/jmap
+ jdk:/usr/bin/jmod:/${_jdk_home}/bin/jmod
+ jdk:/usr/bin/jps:/${_jdk_home}/bin/jps
+ jdk:/usr/bin/jrunscript:/${_jdk_home}/bin/jrunscript
+ jdk:/usr/bin/jshell:/${_jdk_home}/bin/jshell
+ jdk:/usr/bin/jstack:/${_jdk_home}/bin/jstack
+ jdk:/usr/bin/jstat:/${_jdk_home}/bin/jstat
+ jdk:/usr/bin/jstatd:/${_jdk_home}/bin/jstatd
+ jdk:/usr/bin/keytool:/${_jdk_home}/bin/keytool
+ jdk:/usr/bin/pack200:/${_jdk_home}/bin/pack200
+ jdk:/usr/bin/rmic:/${_jdk_home}/bin/rmic
+ jdk:/usr/bin/rmid:/${_jdk_home}/bin/rmid
+ jdk:/usr/bin/rmiregistry:/${_jdk_home}/bin/rmiregistry
+ jdk:/usr/bin/serialver:/${_jdk_home}/bin/serialver
+ jdk:/usr/bin/unpack200:/${_jdk_home}/bin/unpack200
 "
 
 post_extract() {
@@ -151,11 +151,11 @@ do_configure() {
 }
 
 do_install() {
-	vmkdir usr/lib/jvm/openjdk${_java_ver}
-	vcopy build/*-normal-*-release/images/jdk/* "usr/lib/jvm/openjdk${_java_ver}"
-	vmkdir usr/lib/jvm/$_openjdk_version/lib/security
-	make-ca -g -f --destdir "${PWD}/ca" -k "${DESTDIR}/usr/lib/jvm/openjdk${_java_ver}/bin/keytool"
-	mv ./ca/etc/pki/tls/java/cacerts ${DESTDIR}/usr/lib/jvm/openjdk${_java_ver}/lib/security/
+	vmkdir $_jdk_home
+	vcopy build/*-normal-*-release/images/jdk/* $_jdk_home
+	vmkdir $_jdk_home/lib/security
+	make-ca -g -f --destdir "${PWD}/ca" -k $DESTDIR/$_jdk_home/bin/keytool
+	mv ./ca/etc/pki/tls/java/cacerts $DESTDIR/$_jdk_home/lib/security/
 	chmod -R ugo+rw ./ca
 	rm -Rf ./ca
 	vmkdir etc/profile.d
@@ -170,14 +170,14 @@ openjdk11-doc_package() {
 	nostrip=yes
 	noverifyrdeps=yes
 	noshlibprovides=yes
-	short_desc+=" -- documentation"
+	short_desc+=" - documentation"
 	pkg_install() {
 		cd ${wrksrc}
 		if [ "$build_option_docs" ]; then
 			vmkdir usr/share/doc/openjdk11
-			cp -a build/linux-*/images/docs/* ${PKGDESTDIR}/usr/share/doc/openjdk11
+			cp -a build/linux-*/images/docs/* $PKGDESTDIR/usr/share/doc/openjdk11
 		fi
-		vmove usr/lib/jvm/openjdk11/man/man1
+		vmove $_jdk_home/man/man1
 	}
 }
 
@@ -185,17 +185,17 @@ openjdk11-src_package() {
 	nostrip=yes
 	noverifyrdeps=yes
 	noshlibprovides=yes
-	short_desc+=" -- sources"
+	short_desc+=" - sources"
 	pkg_install() {
-		vmove "usr/lib/jvm/openjdk11/lib/src.zip"
+		vmove $_jdk_home/lib/src.zip
 	}
 }
 
 openjdk11-static-libs_package() {
 	notstrip=yes
-	short_desc+=" -- static libs"
+	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}"
+		vmkdir $_jdk_home
+		vcopy build/*-normal-*-release/images/static-libs/lib $_jdk_home
 	}
 }

From d8034a01c7edb853bbde0badc852497a08f2acbb Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Mon, 4 Apr 2022 12:25:32 -0400
Subject: [PATCH 2/5] New package: openjdk11-jre-11.0.12+5.

---
 common/shlibs              | 12 +++++------
 srcpkgs/openjdk11-jre      |  1 +
 srcpkgs/openjdk11/template | 44 ++++++++++++++++++++++++++++++++------
 3 files changed, 44 insertions(+), 13 deletions(-)
 create mode 120000 srcpkgs/openjdk11-jre

diff --git a/common/shlibs b/common/shlibs
index ae4bb44c57a3..458a4c40b16e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1810,12 +1810,12 @@ libawt_xawt.so openjdk8-jre-8u20_1
 libjava.so openjdk8-jre-8u20_1
 libjli.so openjdk8-jre-8u20_1
 libjvm.so openjdk8-jre-8u20_1
-libjawt.so openjdk11-11.0.5+10_1
-libawt.so openjdk11-11.0.5+10_1
-libawt_xawt.so openjdk11-11.0.5+10_1
-libjava.so openjdk11-11.0.5+10_1
-libjli.so openjdk11-11.0.5+10_1
-libjvm.so openjdk11-11.0.5+10_1
+libjawt.so openjdk11-jre-11.0.5+10_1
+libawt.so openjdk11-jre-11.0.5+10_1
+libawt_xawt.so openjdk11-jre-11.0.5+10_1
+libjava.so openjdk11-jre-11.0.5+10_1
+libjli.so openjdk11-jre-11.0.5+10_1
+libjvm.so openjdk11-jre-11.0.5+10_1
 libjawt.so openjdk7-bootstrap-7u221b02_1
 libawt.so openjdk7-bootstrap-7u221b02_1
 libawt_xawt.so openjdk7-bootstrap-7u221b02_1
diff --git a/srcpkgs/openjdk11-jre b/srcpkgs/openjdk11-jre
new file mode 120000
index 000000000000..8213494c49ed
--- /dev/null
+++ b/srcpkgs/openjdk11-jre
@@ -0,0 +1 @@
+openjdk11
\ No newline at end of file
diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index 2c670d92ee1d..a2cc31c85aea 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -31,15 +31,14 @@ hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
 makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
  fontconfig-devel zlib-devel lcms2-devel"
-depends="fontconfig"
+depends="${pkgname}-jre-${version}_${revision}"
 short_desc="OpenJDK Java Development Kit"
 maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="GPL-2.0-only WITH Classpath-exception-2.0"
 homepage="http://openjdk.java.net/"
 distfiles="https://hg.openjdk.java.net/jdk-updates/jdk${_java_ver}u/archive/jdk-${version}.tar.gz"
 checksum=ff0edaf800c76ae435840365a9205a5f7277a5a2fd3c79ad874522a15c213559
-provides="java-environment-${version}_1 java-runtime-${version}_1"
-shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so"
+provides="java-environment-${version}_1"
 
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes
@@ -158,14 +157,45 @@ do_install() {
 	mv ./ca/etc/pki/tls/java/cacerts $DESTDIR/$_jdk_home/lib/security/
 	chmod -R ugo+rw ./ca
 	rm -Rf ./ca
-	vmkdir etc/profile.d
-	cat >>${DESTDIR}/etc/profile.d/10_openjdk11.sh <<EOF
-export JAVA_HOME=\${JAVA_HOME=/usr/lib/jvm/openjdk${_java_ver}}
-EOF
 	vlicense ASSEMBLY_EXCEPTION
 	vlicense LICENSE
 }
 
+subpackages="openjdk11-src openjdk11-jre openjdk11-doc openjdk11-static-libs"
+
+openjdk11-jre_package() {
+	shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so"
+	short_desc+=" - runtime components"
+	provides="java-runtime-${version}_1"
+	depends="fontconfig"
+	alternatives="
+	 java:/usr/bin/java:/${_jdk_home}/bin/java
+	 java:/usr/bin/jjs:/${_jdk_home}/bin/jjs
+	 java:/usr/bin/keytool:/${_jdk_home}/bin/keytool
+	 java:/usr/bin/pack200:/${_jdk_home}/bin/pack200
+	 java:/usr/bin/rmid:/${_jdk_home}/bin/rmid
+	 java:/usr/bin/rmiregistry:/${_jdk_home}/bin/rmiregistry
+	 java:/usr/bin/unpack200:/${_jdk_home}/bin/unpack200
+	"
+	pkg_install() {
+		for bf in java jjs keytool pack200 rmid rmiregistry unpack200; do
+			vmove $_jdk_home/bin/$bf
+		done
+
+		for f in lib legal conf release; do
+			vmove $_jdk_home/$f
+		done
+
+		vmkdir etc/profile.d
+		cat >>${PKGDESTDIR}/etc/profile.d/10_openjdk11.sh <<EOF
+export JAVA_HOME=\${JAVA_HOME=/usr/lib/jvm/openjdk${_java_ver}}
+EOF
+
+		vlicense ASSEMBLY_EXCEPTION
+		vlicense LICENSE
+	}
+}
+
 openjdk11-doc_package() {
 	nostrip=yes
 	noverifyrdeps=yes

From a7a688a958801cea2412ab2b08a6d01892023d91 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 20 Apr 2022 19:53:06 -0400
Subject: [PATCH 3/5] New package: openjdk11-jmods-11.0.12+5

fixes #25183
---
 srcpkgs/openjdk11-jmods    |  1 +
 srcpkgs/openjdk11/template | 10 +++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/openjdk11-jmods

diff --git a/srcpkgs/openjdk11-jmods b/srcpkgs/openjdk11-jmods
new file mode 120000
index 000000000000..8213494c49ed
--- /dev/null
+++ b/srcpkgs/openjdk11-jmods
@@ -0,0 +1 @@
+openjdk11
\ No newline at end of file
diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index a2cc31c85aea..371baf17b1bb 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -161,7 +161,7 @@ do_install() {
 	vlicense LICENSE
 }
 
-subpackages="openjdk11-src openjdk11-jre openjdk11-doc openjdk11-static-libs"
+subpackages="openjdk11-src openjdk11-jre openjdk11-doc openjdk11-jmods openjdk11-static-libs"
 
 openjdk11-jre_package() {
 	shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so"
@@ -229,3 +229,11 @@ openjdk11-static-libs_package() {
 		vcopy build/*-normal-*-release/images/static-libs/lib $_jdk_home
 	}
 }
+
+openjdk11-jmods_package() {
+	short_desc+=" - JMODs"
+	depends="${pkgname}-${version}_${revision}"
+	pkg_install() {
+		vmove $_jdk_home/jmods
+	}
+}

From 27380daab5bc23cdd6a522ca44492b72264458c4 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 20 Apr 2022 21:24:39 -0400
Subject: [PATCH 4/5] openjdk11: disable on armv[56]*

fixes #29457
---
 srcpkgs/openjdk11/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index 371baf17b1bb..bba3b98007ee 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -44,10 +44,11 @@ provides="java-environment-${version}_1"
 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

From 1bf5579f265d285612c321f37df472e85756e876 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 20 Apr 2022 20:14:58 -0400
Subject: [PATCH 5/5] openjdk11: update to 11.0.12+7, enable debug.

---
 srcpkgs/openjdk11/template | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index bba3b98007ee..90883afd236c 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=3
+version=11.0.12+7
+revision=1
 _java_ver="${version%%.*}"
 _jdk_home="usr/lib/jvm/openjdk${_java_ver}"
 wrksrc="jdk${_java_ver}u-jdk-${version}"
@@ -16,14 +16,14 @@ configure_args="
  --with-libpng=system
  --with-lcms=system
  --with-jtreg=no
- --with-native-debug-symbols=none
+ --with-native-debug-symbols=internal
  --with-version-pre=
- --with-version-opt="void-r$revision"
+ --with-version-opt=void-r$revision
  --with-version-build=${version#*+}
- --with-vendor-name="Void"
- --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""
+ --with-vendor-name=Void
+ --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 static-libs-image $(vopt_if docs docs)"
 make_check_target="test-hotspot-gtest"
 hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
@@ -37,7 +37,7 @@ maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="GPL-2.0-only WITH Classpath-exception-2.0"
 homepage="http://openjdk.java.net/"
 distfiles="https://hg.openjdk.java.net/jdk-updates/jdk${_java_ver}u/archive/jdk-${version}.tar.gz"
-checksum=ff0edaf800c76ae435840365a9205a5f7277a5a2fd3c79ad874522a15c213559
+checksum=06ad7b39625374c30a8d8be9e7e18f37663ba6fe44c2a66aa7b7987b140d069a
 provides="java-environment-${version}_1"
 
 # Build is still parallel, but don't use -jN.
@@ -72,14 +72,6 @@ else
 fi
 
 alternatives="
- java:/usr/bin/java:/${_jdk_home}/bin/java
- java:/usr/bin/jjs:/${_jdk_home}/bin/jjs
- java:/usr/bin/keytool:/${_jdk_home}/bin/keytool
- java:/usr/bin/pack200:/${_jdk_home}/bin/pack200
- java:/usr/bin/rmid:/${_jdk_home}/bin/rmid
- java:/usr/bin/rmiregistry:/${_jdk_home}/bin/rmiregistry
- java:/usr/bin/unpack200:/${_jdk_home}/bin/unpack200
-
  jdk:/usr/bin/jaotc:/${_jdk_home}/bin/jaotc
  jdk:/usr/bin/jar:/${_jdk_home}/bin/jar
  jdk:/usr/bin/jarsigner:/${_jdk_home}/bin/jarsigner

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PR PATCH] [Updated] openjdk11: update to 11.0.12+7, cleanup, split jre & jmods into subpkgs
  2022-04-04 16:29 [PR PATCH] openjdk11: cleanup, split jre into subpackage classabbyamp
                   ` (10 preceding siblings ...)
  2022-04-21  1:28 ` classabbyamp
@ 2022-04-21  3:31 ` classabbyamp
  2022-04-25 15:05 ` classabbyamp
                   ` (5 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: classabbyamp @ 2022-04-21  3:31 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1997 bytes --]

There is an updated pull request by classabbyamp against master on the void-packages repository

https://github.com/classabbyamp/void-packages openjdk11-cleanup
https://github.com/void-linux/void-packages/pull/36520

openjdk11: update to 11.0.12+7, cleanup, split jre & jmods into subpkgs
- openjdk11: clean up template
- New package: openjdk11-jre-11.0.12+5
- New package: openjdk11-jmods-11.0.12+5
- openjdk11: disable on armv[56]*
- openjdk11: update to 11.0.12+7, enable debug.

fixes #25183
fixes #29457
closes #36221

This should bring openjdk11 more in-line with other openjdk package templates

See [here](https://forums.raspberrypi.com/viewtopic.php?t=232680), [here](https://forums.raspberrypi.com/viewtopic.php?t=323376), and [here](https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=255662) for evidence of the arm incompatibility.

cc: @knusbaum for maintainer review

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

CI fail on aarch64 and armv7l glibc for unresolvable shlibs can be safely ignored.

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/36520.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openjdk11-cleanup-36520.patch --]
[-- Type: text/x-diff, Size: 16129 bytes --]

From ee41720b7a32b17dc42578c48ac10ac5404408ca Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Mon, 4 Apr 2022 12:15:17 -0400
Subject: [PATCH 1/5] openjdk11: clean up template

---
 srcpkgs/openjdk11/template | 110 ++++++++++++++++++-------------------
 1 file changed, 55 insertions(+), 55 deletions(-)

diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index bd38c0c5c010..2c670d92ee1d 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -1,9 +1,9 @@
 # Template file for 'openjdk11'
 pkgname=openjdk11
 version=11.0.12+5
-revision=2
+revision=3
 _java_ver="${version%%.*}"
-_openjdk_version="openjdk-${_java_ver}"
+_jdk_home="usr/lib/jvm/openjdk${_java_ver}"
 wrksrc="jdk${_java_ver}u-jdk-${version}"
 build_style=gnu-configure
 configure_args="
@@ -68,50 +68,50 @@ if [ ! "$CROSS_BUILD" ]; then
 	configure_args+=" --with-boot-jdk=/usr/lib/jvm/java-10-openjdk"
 else
 	hostmakedepends+=" openjdk11"
-	configure_args+=" --with-boot-jdk=/usr/lib/jvm/openjdk11"
+	configure_args+=" --with-boot-jdk=/${_jdk_home}"
 fi
 
 alternatives="
- java:/usr/bin/java:/usr/lib/jvm/openjdk11/bin/java
- java:/usr/bin/jjs:/usr/lib/jvm/openjdk11/bin/jjs
- java:/usr/bin/keytool:/usr/lib/jvm/openjdk11/bin/keytool
- java:/usr/bin/pack200:/usr/lib/jvm/openjdk11/bin/pack200
- java:/usr/bin/rmid:/usr/lib/jvm/openjdk11/bin/rmid
- java:/usr/bin/rmiregistry:/usr/lib/jvm/openjdk11/bin/rmiregistry
- java:/usr/bin/unpack200:/usr/lib/jvm/openjdk11/bin/unpack200
+ java:/usr/bin/java:/${_jdk_home}/bin/java
+ java:/usr/bin/jjs:/${_jdk_home}/bin/jjs
+ java:/usr/bin/keytool:/${_jdk_home}/bin/keytool
+ java:/usr/bin/pack200:/${_jdk_home}/bin/pack200
+ java:/usr/bin/rmid:/${_jdk_home}/bin/rmid
+ java:/usr/bin/rmiregistry:/${_jdk_home}/bin/rmiregistry
+ java:/usr/bin/unpack200:/${_jdk_home}/bin/unpack200
 
- jdk:/usr/bin/jaotc:/usr/lib/jvm/openjdk11/bin/jaotc
- jdk:/usr/bin/jar:/usr/lib/jvm/openjdk11/bin/jar
- jdk:/usr/bin/jarsigner:/usr/lib/jvm/openjdk11/bin/jarsigner
- jdk:/usr/bin/java:/usr/lib/jvm/openjdk11/bin/java
- jdk:/usr/bin/javac:/usr/lib/jvm/openjdk11/bin/javac
- jdk:/usr/bin/javadoc:/usr/lib/jvm/openjdk11/bin/javadoc
- jdk:/usr/bin/javap:/usr/lib/jvm/openjdk11/bin/javap
- jdk:/usr/bin/jcmd:/usr/lib/jvm/openjdk11/bin/jcmd
- jdk:/usr/bin/jconsole:/usr/lib/jvm/openjdk11/bin/jconsole
- jdk:/usr/bin/jdb:/usr/lib/jvm/openjdk11/bin/jdb
- jdk:/usr/bin/jdeprscan:/usr/lib/jvm/openjdk11/bin/jdeprscan
- jdk:/usr/bin/jdeps:/usr/lib/jvm/openjdk11/bin/jdeps
- jdk:/usr/bin/jhsdb:/usr/lib/jvm/openjdk11/bin/jhsdb
- jdk:/usr/bin/jimage:/usr/lib/jvm/openjdk11/bin/jimage
- jdk:/usr/bin/jinfo:/usr/lib/jvm/openjdk11/bin/jinfo
- jdk:/usr/bin/jjs:/usr/lib/jvm/openjdk11/bin/jjs
- jdk:/usr/bin/jlink:/usr/lib/jvm/openjdk11/bin/jlink
- jdk:/usr/bin/jmap:/usr/lib/jvm/openjdk11/bin/jmap
- jdk:/usr/bin/jmod:/usr/lib/jvm/openjdk11/bin/jmod
- jdk:/usr/bin/jps:/usr/lib/jvm/openjdk11/bin/jps
- jdk:/usr/bin/jrunscript:/usr/lib/jvm/openjdk11/bin/jrunscript
- jdk:/usr/bin/jshell:/usr/lib/jvm/openjdk11/bin/jshell
- jdk:/usr/bin/jstack:/usr/lib/jvm/openjdk11/bin/jstack
- jdk:/usr/bin/jstat:/usr/lib/jvm/openjdk11/bin/jstat
- jdk:/usr/bin/jstatd:/usr/lib/jvm/openjdk11/bin/jstatd
- jdk:/usr/bin/keytool:/usr/lib/jvm/openjdk11/bin/keytool
- jdk:/usr/bin/pack200:/usr/lib/jvm/openjdk11/bin/pack200
- jdk:/usr/bin/rmic:/usr/lib/jvm/openjdk11/bin/rmic
- jdk:/usr/bin/rmid:/usr/lib/jvm/openjdk11/bin/rmid
- jdk:/usr/bin/rmiregistry:/usr/lib/jvm/openjdk11/bin/rmiregistry
- jdk:/usr/bin/serialver:/usr/lib/jvm/openjdk11/bin/serialver
- jdk:/usr/bin/unpack200:/usr/lib/jvm/openjdk11/bin/unpack200
+ jdk:/usr/bin/jaotc:/${_jdk_home}/bin/jaotc
+ jdk:/usr/bin/jar:/${_jdk_home}/bin/jar
+ jdk:/usr/bin/jarsigner:/${_jdk_home}/bin/jarsigner
+ jdk:/usr/bin/java:/${_jdk_home}/bin/java
+ jdk:/usr/bin/javac:/${_jdk_home}/bin/javac
+ jdk:/usr/bin/javadoc:/${_jdk_home}/bin/javadoc
+ jdk:/usr/bin/javap:/${_jdk_home}/bin/javap
+ jdk:/usr/bin/jcmd:/${_jdk_home}/bin/jcmd
+ jdk:/usr/bin/jconsole:/${_jdk_home}/bin/jconsole
+ jdk:/usr/bin/jdb:/${_jdk_home}/bin/jdb
+ jdk:/usr/bin/jdeprscan:/${_jdk_home}/bin/jdeprscan
+ jdk:/usr/bin/jdeps:/${_jdk_home}/bin/jdeps
+ jdk:/usr/bin/jhsdb:/${_jdk_home}/bin/jhsdb
+ jdk:/usr/bin/jimage:/${_jdk_home}/bin/jimage
+ jdk:/usr/bin/jinfo:/${_jdk_home}/bin/jinfo
+ jdk:/usr/bin/jjs:/${_jdk_home}/bin/jjs
+ jdk:/usr/bin/jlink:/${_jdk_home}/bin/jlink
+ jdk:/usr/bin/jmap:/${_jdk_home}/bin/jmap
+ jdk:/usr/bin/jmod:/${_jdk_home}/bin/jmod
+ jdk:/usr/bin/jps:/${_jdk_home}/bin/jps
+ jdk:/usr/bin/jrunscript:/${_jdk_home}/bin/jrunscript
+ jdk:/usr/bin/jshell:/${_jdk_home}/bin/jshell
+ jdk:/usr/bin/jstack:/${_jdk_home}/bin/jstack
+ jdk:/usr/bin/jstat:/${_jdk_home}/bin/jstat
+ jdk:/usr/bin/jstatd:/${_jdk_home}/bin/jstatd
+ jdk:/usr/bin/keytool:/${_jdk_home}/bin/keytool
+ jdk:/usr/bin/pack200:/${_jdk_home}/bin/pack200
+ jdk:/usr/bin/rmic:/${_jdk_home}/bin/rmic
+ jdk:/usr/bin/rmid:/${_jdk_home}/bin/rmid
+ jdk:/usr/bin/rmiregistry:/${_jdk_home}/bin/rmiregistry
+ jdk:/usr/bin/serialver:/${_jdk_home}/bin/serialver
+ jdk:/usr/bin/unpack200:/${_jdk_home}/bin/unpack200
 "
 
 post_extract() {
@@ -151,11 +151,11 @@ do_configure() {
 }
 
 do_install() {
-	vmkdir usr/lib/jvm/openjdk${_java_ver}
-	vcopy build/*-normal-*-release/images/jdk/* "usr/lib/jvm/openjdk${_java_ver}"
-	vmkdir usr/lib/jvm/$_openjdk_version/lib/security
-	make-ca -g -f --destdir "${PWD}/ca" -k "${DESTDIR}/usr/lib/jvm/openjdk${_java_ver}/bin/keytool"
-	mv ./ca/etc/pki/tls/java/cacerts ${DESTDIR}/usr/lib/jvm/openjdk${_java_ver}/lib/security/
+	vmkdir $_jdk_home
+	vcopy build/*-normal-*-release/images/jdk/* $_jdk_home
+	vmkdir $_jdk_home/lib/security
+	make-ca -g -f --destdir "${PWD}/ca" -k $DESTDIR/$_jdk_home/bin/keytool
+	mv ./ca/etc/pki/tls/java/cacerts $DESTDIR/$_jdk_home/lib/security/
 	chmod -R ugo+rw ./ca
 	rm -Rf ./ca
 	vmkdir etc/profile.d
@@ -170,14 +170,14 @@ openjdk11-doc_package() {
 	nostrip=yes
 	noverifyrdeps=yes
 	noshlibprovides=yes
-	short_desc+=" -- documentation"
+	short_desc+=" - documentation"
 	pkg_install() {
 		cd ${wrksrc}
 		if [ "$build_option_docs" ]; then
 			vmkdir usr/share/doc/openjdk11
-			cp -a build/linux-*/images/docs/* ${PKGDESTDIR}/usr/share/doc/openjdk11
+			cp -a build/linux-*/images/docs/* $PKGDESTDIR/usr/share/doc/openjdk11
 		fi
-		vmove usr/lib/jvm/openjdk11/man/man1
+		vmove $_jdk_home/man/man1
 	}
 }
 
@@ -185,17 +185,17 @@ openjdk11-src_package() {
 	nostrip=yes
 	noverifyrdeps=yes
 	noshlibprovides=yes
-	short_desc+=" -- sources"
+	short_desc+=" - sources"
 	pkg_install() {
-		vmove "usr/lib/jvm/openjdk11/lib/src.zip"
+		vmove $_jdk_home/lib/src.zip
 	}
 }
 
 openjdk11-static-libs_package() {
 	notstrip=yes
-	short_desc+=" -- static libs"
+	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}"
+		vmkdir $_jdk_home
+		vcopy build/*-normal-*-release/images/static-libs/lib $_jdk_home
 	}
 }

From d8034a01c7edb853bbde0badc852497a08f2acbb Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Mon, 4 Apr 2022 12:25:32 -0400
Subject: [PATCH 2/5] New package: openjdk11-jre-11.0.12+5.

---
 common/shlibs              | 12 +++++------
 srcpkgs/openjdk11-jre      |  1 +
 srcpkgs/openjdk11/template | 44 ++++++++++++++++++++++++++++++++------
 3 files changed, 44 insertions(+), 13 deletions(-)
 create mode 120000 srcpkgs/openjdk11-jre

diff --git a/common/shlibs b/common/shlibs
index ae4bb44c57a3..458a4c40b16e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1810,12 +1810,12 @@ libawt_xawt.so openjdk8-jre-8u20_1
 libjava.so openjdk8-jre-8u20_1
 libjli.so openjdk8-jre-8u20_1
 libjvm.so openjdk8-jre-8u20_1
-libjawt.so openjdk11-11.0.5+10_1
-libawt.so openjdk11-11.0.5+10_1
-libawt_xawt.so openjdk11-11.0.5+10_1
-libjava.so openjdk11-11.0.5+10_1
-libjli.so openjdk11-11.0.5+10_1
-libjvm.so openjdk11-11.0.5+10_1
+libjawt.so openjdk11-jre-11.0.5+10_1
+libawt.so openjdk11-jre-11.0.5+10_1
+libawt_xawt.so openjdk11-jre-11.0.5+10_1
+libjava.so openjdk11-jre-11.0.5+10_1
+libjli.so openjdk11-jre-11.0.5+10_1
+libjvm.so openjdk11-jre-11.0.5+10_1
 libjawt.so openjdk7-bootstrap-7u221b02_1
 libawt.so openjdk7-bootstrap-7u221b02_1
 libawt_xawt.so openjdk7-bootstrap-7u221b02_1
diff --git a/srcpkgs/openjdk11-jre b/srcpkgs/openjdk11-jre
new file mode 120000
index 000000000000..8213494c49ed
--- /dev/null
+++ b/srcpkgs/openjdk11-jre
@@ -0,0 +1 @@
+openjdk11
\ No newline at end of file
diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index 2c670d92ee1d..a2cc31c85aea 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -31,15 +31,14 @@ hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
 makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
  fontconfig-devel zlib-devel lcms2-devel"
-depends="fontconfig"
+depends="${pkgname}-jre-${version}_${revision}"
 short_desc="OpenJDK Java Development Kit"
 maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="GPL-2.0-only WITH Classpath-exception-2.0"
 homepage="http://openjdk.java.net/"
 distfiles="https://hg.openjdk.java.net/jdk-updates/jdk${_java_ver}u/archive/jdk-${version}.tar.gz"
 checksum=ff0edaf800c76ae435840365a9205a5f7277a5a2fd3c79ad874522a15c213559
-provides="java-environment-${version}_1 java-runtime-${version}_1"
-shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so"
+provides="java-environment-${version}_1"
 
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes
@@ -158,14 +157,45 @@ do_install() {
 	mv ./ca/etc/pki/tls/java/cacerts $DESTDIR/$_jdk_home/lib/security/
 	chmod -R ugo+rw ./ca
 	rm -Rf ./ca
-	vmkdir etc/profile.d
-	cat >>${DESTDIR}/etc/profile.d/10_openjdk11.sh <<EOF
-export JAVA_HOME=\${JAVA_HOME=/usr/lib/jvm/openjdk${_java_ver}}
-EOF
 	vlicense ASSEMBLY_EXCEPTION
 	vlicense LICENSE
 }
 
+subpackages="openjdk11-src openjdk11-jre openjdk11-doc openjdk11-static-libs"
+
+openjdk11-jre_package() {
+	shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so"
+	short_desc+=" - runtime components"
+	provides="java-runtime-${version}_1"
+	depends="fontconfig"
+	alternatives="
+	 java:/usr/bin/java:/${_jdk_home}/bin/java
+	 java:/usr/bin/jjs:/${_jdk_home}/bin/jjs
+	 java:/usr/bin/keytool:/${_jdk_home}/bin/keytool
+	 java:/usr/bin/pack200:/${_jdk_home}/bin/pack200
+	 java:/usr/bin/rmid:/${_jdk_home}/bin/rmid
+	 java:/usr/bin/rmiregistry:/${_jdk_home}/bin/rmiregistry
+	 java:/usr/bin/unpack200:/${_jdk_home}/bin/unpack200
+	"
+	pkg_install() {
+		for bf in java jjs keytool pack200 rmid rmiregistry unpack200; do
+			vmove $_jdk_home/bin/$bf
+		done
+
+		for f in lib legal conf release; do
+			vmove $_jdk_home/$f
+		done
+
+		vmkdir etc/profile.d
+		cat >>${PKGDESTDIR}/etc/profile.d/10_openjdk11.sh <<EOF
+export JAVA_HOME=\${JAVA_HOME=/usr/lib/jvm/openjdk${_java_ver}}
+EOF
+
+		vlicense ASSEMBLY_EXCEPTION
+		vlicense LICENSE
+	}
+}
+
 openjdk11-doc_package() {
 	nostrip=yes
 	noverifyrdeps=yes

From a7a688a958801cea2412ab2b08a6d01892023d91 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 20 Apr 2022 19:53:06 -0400
Subject: [PATCH 3/5] New package: openjdk11-jmods-11.0.12+5

fixes #25183
---
 srcpkgs/openjdk11-jmods    |  1 +
 srcpkgs/openjdk11/template | 10 +++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/openjdk11-jmods

diff --git a/srcpkgs/openjdk11-jmods b/srcpkgs/openjdk11-jmods
new file mode 120000
index 000000000000..8213494c49ed
--- /dev/null
+++ b/srcpkgs/openjdk11-jmods
@@ -0,0 +1 @@
+openjdk11
\ No newline at end of file
diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index a2cc31c85aea..371baf17b1bb 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -161,7 +161,7 @@ do_install() {
 	vlicense LICENSE
 }
 
-subpackages="openjdk11-src openjdk11-jre openjdk11-doc openjdk11-static-libs"
+subpackages="openjdk11-src openjdk11-jre openjdk11-doc openjdk11-jmods openjdk11-static-libs"
 
 openjdk11-jre_package() {
 	shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so"
@@ -229,3 +229,11 @@ openjdk11-static-libs_package() {
 		vcopy build/*-normal-*-release/images/static-libs/lib $_jdk_home
 	}
 }
+
+openjdk11-jmods_package() {
+	short_desc+=" - JMODs"
+	depends="${pkgname}-${version}_${revision}"
+	pkg_install() {
+		vmove $_jdk_home/jmods
+	}
+}

From 27380daab5bc23cdd6a522ca44492b72264458c4 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 20 Apr 2022 21:24:39 -0400
Subject: [PATCH 4/5] openjdk11: disable on armv[56]*

fixes #29457
---
 srcpkgs/openjdk11/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index 371baf17b1bb..bba3b98007ee 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -44,10 +44,11 @@ provides="java-environment-${version}_1"
 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

From 92c42780b7833934734622f07a1e973e15161189 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 20 Apr 2022 20:14:58 -0400
Subject: [PATCH 5/5] openjdk11: update to 11.0.12+7, enable debug.

---
 srcpkgs/openjdk11/template | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index bba3b98007ee..90883afd236c 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=3
+version=11.0.12+7
+revision=1
 _java_ver="${version%%.*}"
 _jdk_home="usr/lib/jvm/openjdk${_java_ver}"
 wrksrc="jdk${_java_ver}u-jdk-${version}"
@@ -16,14 +16,14 @@ configure_args="
  --with-libpng=system
  --with-lcms=system
  --with-jtreg=no
- --with-native-debug-symbols=none
+ --with-native-debug-symbols=internal
  --with-version-pre=
- --with-version-opt="void-r$revision"
+ --with-version-opt=void-r$revision
  --with-version-build=${version#*+}
- --with-vendor-name="Void"
- --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""
+ --with-vendor-name=Void
+ --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 static-libs-image $(vopt_if docs docs)"
 make_check_target="test-hotspot-gtest"
 hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
@@ -37,7 +37,7 @@ maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="GPL-2.0-only WITH Classpath-exception-2.0"
 homepage="http://openjdk.java.net/"
 distfiles="https://hg.openjdk.java.net/jdk-updates/jdk${_java_ver}u/archive/jdk-${version}.tar.gz"
-checksum=ff0edaf800c76ae435840365a9205a5f7277a5a2fd3c79ad874522a15c213559
+checksum=06ad7b39625374c30a8d8be9e7e18f37663ba6fe44c2a66aa7b7987b140d069a
 provides="java-environment-${version}_1"
 
 # Build is still parallel, but don't use -jN.
@@ -72,14 +72,6 @@ else
 fi
 
 alternatives="
- java:/usr/bin/java:/${_jdk_home}/bin/java
- java:/usr/bin/jjs:/${_jdk_home}/bin/jjs
- java:/usr/bin/keytool:/${_jdk_home}/bin/keytool
- java:/usr/bin/pack200:/${_jdk_home}/bin/pack200
- java:/usr/bin/rmid:/${_jdk_home}/bin/rmid
- java:/usr/bin/rmiregistry:/${_jdk_home}/bin/rmiregistry
- java:/usr/bin/unpack200:/${_jdk_home}/bin/unpack200
-
  jdk:/usr/bin/jaotc:/${_jdk_home}/bin/jaotc
  jdk:/usr/bin/jar:/${_jdk_home}/bin/jar
  jdk:/usr/bin/jarsigner:/${_jdk_home}/bin/jarsigner

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PR PATCH] [Updated] openjdk11: update to 11.0.12+7, cleanup, split jre & jmods into subpkgs
  2022-04-04 16:29 [PR PATCH] openjdk11: cleanup, split jre into subpackage classabbyamp
                   ` (11 preceding siblings ...)
  2022-04-21  3:31 ` classabbyamp
@ 2022-04-25 15:05 ` classabbyamp
  2022-04-25 15:10 ` classabbyamp
                   ` (4 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: classabbyamp @ 2022-04-25 15:05 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1997 bytes --]

There is an updated pull request by classabbyamp against master on the void-packages repository

https://github.com/classabbyamp/void-packages openjdk11-cleanup
https://github.com/void-linux/void-packages/pull/36520

openjdk11: update to 11.0.12+7, cleanup, split jre & jmods into subpkgs
- openjdk11: clean up template
- New package: openjdk11-jre-11.0.12+5
- New package: openjdk11-jmods-11.0.12+5
- openjdk11: disable on armv[56]*
- openjdk11: update to 11.0.12+7, enable debug.

fixes #25183
fixes #29457
closes #36221

This should bring openjdk11 more in-line with other openjdk package templates

See [here](https://forums.raspberrypi.com/viewtopic.php?t=232680), [here](https://forums.raspberrypi.com/viewtopic.php?t=323376), and [here](https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=255662) for evidence of the arm incompatibility.

cc: @knusbaum for maintainer review

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

CI fail on aarch64 and armv7l glibc for unresolvable shlibs can be safely ignored.

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/36520.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openjdk11-cleanup-36520.patch --]
[-- Type: text/x-diff, Size: 16633 bytes --]

From 6e212d5a1e5a662a859b92858662a935b3651ab2 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Mon, 4 Apr 2022 12:15:17 -0400
Subject: [PATCH 1/5] openjdk11: clean up template

---
 srcpkgs/openjdk11/template | 112 ++++++++++++++++++-------------------
 1 file changed, 56 insertions(+), 56 deletions(-)

diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index bd38c0c5c010..a7e3ed176e19 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -1,9 +1,9 @@
 # Template file for 'openjdk11'
 pkgname=openjdk11
 version=11.0.12+5
-revision=2
+revision=3
 _java_ver="${version%%.*}"
-_openjdk_version="openjdk-${_java_ver}"
+_jdk_home="usr/lib/jvm/openjdk${_java_ver}"
 wrksrc="jdk${_java_ver}u-jdk-${version}"
 build_style=gnu-configure
 configure_args="
@@ -32,7 +32,7 @@ makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
  fontconfig-devel zlib-devel lcms2-devel"
 depends="fontconfig"
-short_desc="OpenJDK Java Development Kit"
+short_desc="OpenJDK Java Development Kit (version ${_java_ver})"
 maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="GPL-2.0-only WITH Classpath-exception-2.0"
 homepage="http://openjdk.java.net/"
@@ -68,50 +68,50 @@ if [ ! "$CROSS_BUILD" ]; then
 	configure_args+=" --with-boot-jdk=/usr/lib/jvm/java-10-openjdk"
 else
 	hostmakedepends+=" openjdk11"
-	configure_args+=" --with-boot-jdk=/usr/lib/jvm/openjdk11"
+	configure_args+=" --with-boot-jdk=/${_jdk_home}"
 fi
 
 alternatives="
- java:/usr/bin/java:/usr/lib/jvm/openjdk11/bin/java
- java:/usr/bin/jjs:/usr/lib/jvm/openjdk11/bin/jjs
- java:/usr/bin/keytool:/usr/lib/jvm/openjdk11/bin/keytool
- java:/usr/bin/pack200:/usr/lib/jvm/openjdk11/bin/pack200
- java:/usr/bin/rmid:/usr/lib/jvm/openjdk11/bin/rmid
- java:/usr/bin/rmiregistry:/usr/lib/jvm/openjdk11/bin/rmiregistry
- java:/usr/bin/unpack200:/usr/lib/jvm/openjdk11/bin/unpack200
+ java:/usr/bin/java:/${_jdk_home}/bin/java
+ java:/usr/bin/jjs:/${_jdk_home}/bin/jjs
+ java:/usr/bin/keytool:/${_jdk_home}/bin/keytool
+ java:/usr/bin/pack200:/${_jdk_home}/bin/pack200
+ java:/usr/bin/rmid:/${_jdk_home}/bin/rmid
+ java:/usr/bin/rmiregistry:/${_jdk_home}/bin/rmiregistry
+ java:/usr/bin/unpack200:/${_jdk_home}/bin/unpack200
 
- jdk:/usr/bin/jaotc:/usr/lib/jvm/openjdk11/bin/jaotc
- jdk:/usr/bin/jar:/usr/lib/jvm/openjdk11/bin/jar
- jdk:/usr/bin/jarsigner:/usr/lib/jvm/openjdk11/bin/jarsigner
- jdk:/usr/bin/java:/usr/lib/jvm/openjdk11/bin/java
- jdk:/usr/bin/javac:/usr/lib/jvm/openjdk11/bin/javac
- jdk:/usr/bin/javadoc:/usr/lib/jvm/openjdk11/bin/javadoc
- jdk:/usr/bin/javap:/usr/lib/jvm/openjdk11/bin/javap
- jdk:/usr/bin/jcmd:/usr/lib/jvm/openjdk11/bin/jcmd
- jdk:/usr/bin/jconsole:/usr/lib/jvm/openjdk11/bin/jconsole
- jdk:/usr/bin/jdb:/usr/lib/jvm/openjdk11/bin/jdb
- jdk:/usr/bin/jdeprscan:/usr/lib/jvm/openjdk11/bin/jdeprscan
- jdk:/usr/bin/jdeps:/usr/lib/jvm/openjdk11/bin/jdeps
- jdk:/usr/bin/jhsdb:/usr/lib/jvm/openjdk11/bin/jhsdb
- jdk:/usr/bin/jimage:/usr/lib/jvm/openjdk11/bin/jimage
- jdk:/usr/bin/jinfo:/usr/lib/jvm/openjdk11/bin/jinfo
- jdk:/usr/bin/jjs:/usr/lib/jvm/openjdk11/bin/jjs
- jdk:/usr/bin/jlink:/usr/lib/jvm/openjdk11/bin/jlink
- jdk:/usr/bin/jmap:/usr/lib/jvm/openjdk11/bin/jmap
- jdk:/usr/bin/jmod:/usr/lib/jvm/openjdk11/bin/jmod
- jdk:/usr/bin/jps:/usr/lib/jvm/openjdk11/bin/jps
- jdk:/usr/bin/jrunscript:/usr/lib/jvm/openjdk11/bin/jrunscript
- jdk:/usr/bin/jshell:/usr/lib/jvm/openjdk11/bin/jshell
- jdk:/usr/bin/jstack:/usr/lib/jvm/openjdk11/bin/jstack
- jdk:/usr/bin/jstat:/usr/lib/jvm/openjdk11/bin/jstat
- jdk:/usr/bin/jstatd:/usr/lib/jvm/openjdk11/bin/jstatd
- jdk:/usr/bin/keytool:/usr/lib/jvm/openjdk11/bin/keytool
- jdk:/usr/bin/pack200:/usr/lib/jvm/openjdk11/bin/pack200
- jdk:/usr/bin/rmic:/usr/lib/jvm/openjdk11/bin/rmic
- jdk:/usr/bin/rmid:/usr/lib/jvm/openjdk11/bin/rmid
- jdk:/usr/bin/rmiregistry:/usr/lib/jvm/openjdk11/bin/rmiregistry
- jdk:/usr/bin/serialver:/usr/lib/jvm/openjdk11/bin/serialver
- jdk:/usr/bin/unpack200:/usr/lib/jvm/openjdk11/bin/unpack200
+ jdk:/usr/bin/jaotc:/${_jdk_home}/bin/jaotc
+ jdk:/usr/bin/jar:/${_jdk_home}/bin/jar
+ jdk:/usr/bin/jarsigner:/${_jdk_home}/bin/jarsigner
+ jdk:/usr/bin/java:/${_jdk_home}/bin/java
+ jdk:/usr/bin/javac:/${_jdk_home}/bin/javac
+ jdk:/usr/bin/javadoc:/${_jdk_home}/bin/javadoc
+ jdk:/usr/bin/javap:/${_jdk_home}/bin/javap
+ jdk:/usr/bin/jcmd:/${_jdk_home}/bin/jcmd
+ jdk:/usr/bin/jconsole:/${_jdk_home}/bin/jconsole
+ jdk:/usr/bin/jdb:/${_jdk_home}/bin/jdb
+ jdk:/usr/bin/jdeprscan:/${_jdk_home}/bin/jdeprscan
+ jdk:/usr/bin/jdeps:/${_jdk_home}/bin/jdeps
+ jdk:/usr/bin/jhsdb:/${_jdk_home}/bin/jhsdb
+ jdk:/usr/bin/jimage:/${_jdk_home}/bin/jimage
+ jdk:/usr/bin/jinfo:/${_jdk_home}/bin/jinfo
+ jdk:/usr/bin/jjs:/${_jdk_home}/bin/jjs
+ jdk:/usr/bin/jlink:/${_jdk_home}/bin/jlink
+ jdk:/usr/bin/jmap:/${_jdk_home}/bin/jmap
+ jdk:/usr/bin/jmod:/${_jdk_home}/bin/jmod
+ jdk:/usr/bin/jps:/${_jdk_home}/bin/jps
+ jdk:/usr/bin/jrunscript:/${_jdk_home}/bin/jrunscript
+ jdk:/usr/bin/jshell:/${_jdk_home}/bin/jshell
+ jdk:/usr/bin/jstack:/${_jdk_home}/bin/jstack
+ jdk:/usr/bin/jstat:/${_jdk_home}/bin/jstat
+ jdk:/usr/bin/jstatd:/${_jdk_home}/bin/jstatd
+ jdk:/usr/bin/keytool:/${_jdk_home}/bin/keytool
+ jdk:/usr/bin/pack200:/${_jdk_home}/bin/pack200
+ jdk:/usr/bin/rmic:/${_jdk_home}/bin/rmic
+ jdk:/usr/bin/rmid:/${_jdk_home}/bin/rmid
+ jdk:/usr/bin/rmiregistry:/${_jdk_home}/bin/rmiregistry
+ jdk:/usr/bin/serialver:/${_jdk_home}/bin/serialver
+ jdk:/usr/bin/unpack200:/${_jdk_home}/bin/unpack200
 "
 
 post_extract() {
@@ -151,11 +151,11 @@ do_configure() {
 }
 
 do_install() {
-	vmkdir usr/lib/jvm/openjdk${_java_ver}
-	vcopy build/*-normal-*-release/images/jdk/* "usr/lib/jvm/openjdk${_java_ver}"
-	vmkdir usr/lib/jvm/$_openjdk_version/lib/security
-	make-ca -g -f --destdir "${PWD}/ca" -k "${DESTDIR}/usr/lib/jvm/openjdk${_java_ver}/bin/keytool"
-	mv ./ca/etc/pki/tls/java/cacerts ${DESTDIR}/usr/lib/jvm/openjdk${_java_ver}/lib/security/
+	vmkdir $_jdk_home
+	vcopy build/*-normal-*-release/images/jdk/* $_jdk_home
+	vmkdir $_jdk_home/lib/security
+	make-ca -g -f --destdir "${PWD}/ca" -k $DESTDIR/$_jdk_home/bin/keytool
+	mv ./ca/etc/pki/tls/java/cacerts $DESTDIR/$_jdk_home/lib/security/
 	chmod -R ugo+rw ./ca
 	rm -Rf ./ca
 	vmkdir etc/profile.d
@@ -170,14 +170,14 @@ openjdk11-doc_package() {
 	nostrip=yes
 	noverifyrdeps=yes
 	noshlibprovides=yes
-	short_desc+=" -- documentation"
+	short_desc+=" - documentation"
 	pkg_install() {
 		cd ${wrksrc}
 		if [ "$build_option_docs" ]; then
 			vmkdir usr/share/doc/openjdk11
-			cp -a build/linux-*/images/docs/* ${PKGDESTDIR}/usr/share/doc/openjdk11
+			cp -a build/linux-*/images/docs/* $PKGDESTDIR/usr/share/doc/openjdk11
 		fi
-		vmove usr/lib/jvm/openjdk11/man/man1
+		vmove $_jdk_home/man/man1
 	}
 }
 
@@ -185,17 +185,17 @@ openjdk11-src_package() {
 	nostrip=yes
 	noverifyrdeps=yes
 	noshlibprovides=yes
-	short_desc+=" -- sources"
+	short_desc+=" - sources"
 	pkg_install() {
-		vmove "usr/lib/jvm/openjdk11/lib/src.zip"
+		vmove $_jdk_home/lib/src.zip
 	}
 }
 
 openjdk11-static-libs_package() {
 	notstrip=yes
-	short_desc+=" -- static libs"
+	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}"
+		vmkdir $_jdk_home
+		vcopy build/*-normal-*-release/images/static-libs/lib $_jdk_home
 	}
 }

From e1aa544465b0ecb99b126c7c3521636df390cddc Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Mon, 4 Apr 2022 12:25:32 -0400
Subject: [PATCH 2/5] New package: openjdk11-jre-11.0.12+5.

---
 common/shlibs              | 12 +++++------
 srcpkgs/openjdk11-jre      |  1 +
 srcpkgs/openjdk11/template | 44 ++++++++++++++++++++++++++++++++------
 3 files changed, 44 insertions(+), 13 deletions(-)
 create mode 120000 srcpkgs/openjdk11-jre

diff --git a/common/shlibs b/common/shlibs
index ae4bb44c57a3..458a4c40b16e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1810,12 +1810,12 @@ libawt_xawt.so openjdk8-jre-8u20_1
 libjava.so openjdk8-jre-8u20_1
 libjli.so openjdk8-jre-8u20_1
 libjvm.so openjdk8-jre-8u20_1
-libjawt.so openjdk11-11.0.5+10_1
-libawt.so openjdk11-11.0.5+10_1
-libawt_xawt.so openjdk11-11.0.5+10_1
-libjava.so openjdk11-11.0.5+10_1
-libjli.so openjdk11-11.0.5+10_1
-libjvm.so openjdk11-11.0.5+10_1
+libjawt.so openjdk11-jre-11.0.5+10_1
+libawt.so openjdk11-jre-11.0.5+10_1
+libawt_xawt.so openjdk11-jre-11.0.5+10_1
+libjava.so openjdk11-jre-11.0.5+10_1
+libjli.so openjdk11-jre-11.0.5+10_1
+libjvm.so openjdk11-jre-11.0.5+10_1
 libjawt.so openjdk7-bootstrap-7u221b02_1
 libawt.so openjdk7-bootstrap-7u221b02_1
 libawt_xawt.so openjdk7-bootstrap-7u221b02_1
diff --git a/srcpkgs/openjdk11-jre b/srcpkgs/openjdk11-jre
new file mode 120000
index 000000000000..8213494c49ed
--- /dev/null
+++ b/srcpkgs/openjdk11-jre
@@ -0,0 +1 @@
+openjdk11
\ No newline at end of file
diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index a7e3ed176e19..f0b16258cf9f 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -31,15 +31,14 @@ hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
 makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
  fontconfig-devel zlib-devel lcms2-devel"
-depends="fontconfig"
+depends="${pkgname}-jre-${version}_${revision}"
 short_desc="OpenJDK Java Development Kit (version ${_java_ver})"
 maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="GPL-2.0-only WITH Classpath-exception-2.0"
 homepage="http://openjdk.java.net/"
 distfiles="https://hg.openjdk.java.net/jdk-updates/jdk${_java_ver}u/archive/jdk-${version}.tar.gz"
 checksum=ff0edaf800c76ae435840365a9205a5f7277a5a2fd3c79ad874522a15c213559
-provides="java-environment-${version}_1 java-runtime-${version}_1"
-shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so"
+provides="java-environment-${version}_1"
 
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes
@@ -158,14 +157,45 @@ do_install() {
 	mv ./ca/etc/pki/tls/java/cacerts $DESTDIR/$_jdk_home/lib/security/
 	chmod -R ugo+rw ./ca
 	rm -Rf ./ca
-	vmkdir etc/profile.d
-	cat >>${DESTDIR}/etc/profile.d/10_openjdk11.sh <<EOF
-export JAVA_HOME=\${JAVA_HOME=/usr/lib/jvm/openjdk${_java_ver}}
-EOF
 	vlicense ASSEMBLY_EXCEPTION
 	vlicense LICENSE
 }
 
+subpackages="openjdk11-src openjdk11-jre openjdk11-doc openjdk11-static-libs"
+
+openjdk11-jre_package() {
+	shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so"
+	short_desc+=" - runtime components"
+	provides="java-runtime-${version}_1"
+	depends="fontconfig"
+	alternatives="
+	 java:/usr/bin/java:/${_jdk_home}/bin/java
+	 java:/usr/bin/jjs:/${_jdk_home}/bin/jjs
+	 java:/usr/bin/keytool:/${_jdk_home}/bin/keytool
+	 java:/usr/bin/pack200:/${_jdk_home}/bin/pack200
+	 java:/usr/bin/rmid:/${_jdk_home}/bin/rmid
+	 java:/usr/bin/rmiregistry:/${_jdk_home}/bin/rmiregistry
+	 java:/usr/bin/unpack200:/${_jdk_home}/bin/unpack200
+	"
+	pkg_install() {
+		for bf in java jjs keytool pack200 rmid rmiregistry unpack200; do
+			vmove $_jdk_home/bin/$bf
+		done
+
+		for f in lib legal conf release; do
+			vmove $_jdk_home/$f
+		done
+
+		vmkdir etc/profile.d
+		cat >>${PKGDESTDIR}/etc/profile.d/10_openjdk11.sh <<EOF
+export JAVA_HOME=\${JAVA_HOME=/usr/lib/jvm/openjdk${_java_ver}}
+EOF
+
+		vlicense ASSEMBLY_EXCEPTION
+		vlicense LICENSE
+	}
+}
+
 openjdk11-doc_package() {
 	nostrip=yes
 	noverifyrdeps=yes

From ddc769e8b695ca1e0cc992b14f545a32f09a10f7 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 20 Apr 2022 19:53:06 -0400
Subject: [PATCH 3/5] New package: openjdk11-jmods-11.0.12+5

fixes #25183
---
 srcpkgs/openjdk11-jmods    |  1 +
 srcpkgs/openjdk11/template | 10 +++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/openjdk11-jmods

diff --git a/srcpkgs/openjdk11-jmods b/srcpkgs/openjdk11-jmods
new file mode 120000
index 000000000000..8213494c49ed
--- /dev/null
+++ b/srcpkgs/openjdk11-jmods
@@ -0,0 +1 @@
+openjdk11
\ No newline at end of file
diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index f0b16258cf9f..ba11f44a43c9 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -161,7 +161,7 @@ do_install() {
 	vlicense LICENSE
 }
 
-subpackages="openjdk11-src openjdk11-jre openjdk11-doc openjdk11-static-libs"
+subpackages="openjdk11-src openjdk11-jre openjdk11-doc openjdk11-jmods openjdk11-static-libs"
 
 openjdk11-jre_package() {
 	shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so"
@@ -229,3 +229,11 @@ openjdk11-static-libs_package() {
 		vcopy build/*-normal-*-release/images/static-libs/lib $_jdk_home
 	}
 }
+
+openjdk11-jmods_package() {
+	short_desc+=" - JMODs"
+	depends="${pkgname}-${version}_${revision}"
+	pkg_install() {
+		vmove $_jdk_home/jmods
+	}
+}

From 3d4a98de06a2b4ef9c907ae49b5d6d3caa139b67 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 20 Apr 2022 21:24:39 -0400
Subject: [PATCH 4/5] openjdk11: disable on armv[56]*

fixes #29457
---
 srcpkgs/openjdk11/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index ba11f44a43c9..f164f5de741f 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -44,10 +44,11 @@ provides="java-environment-${version}_1"
 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

From 87e121494b6dcf7d9d2188f445c39b4be2281e28 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 20 Apr 2022 20:14:58 -0400
Subject: [PATCH 5/5] openjdk11: update to 11.0.12+7, enable debug.

---
 srcpkgs/openjdk11/template | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index f164f5de741f..711376c10824 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=3
+version=11.0.12+7
+revision=1
 _java_ver="${version%%.*}"
 _jdk_home="usr/lib/jvm/openjdk${_java_ver}"
 wrksrc="jdk${_java_ver}u-jdk-${version}"
@@ -16,14 +16,14 @@ configure_args="
  --with-libpng=system
  --with-lcms=system
  --with-jtreg=no
- --with-native-debug-symbols=none
+ --with-native-debug-symbols=internal
  --with-version-pre=
- --with-version-opt="void-r$revision"
+ --with-version-opt=void-r$revision
  --with-version-build=${version#*+}
- --with-vendor-name="Void"
- --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""
+ --with-vendor-name=Void
+ --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 static-libs-image $(vopt_if docs docs)"
 make_check_target="test-hotspot-gtest"
 hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
@@ -37,7 +37,7 @@ maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="GPL-2.0-only WITH Classpath-exception-2.0"
 homepage="http://openjdk.java.net/"
 distfiles="https://hg.openjdk.java.net/jdk-updates/jdk${_java_ver}u/archive/jdk-${version}.tar.gz"
-checksum=ff0edaf800c76ae435840365a9205a5f7277a5a2fd3c79ad874522a15c213559
+checksum=06ad7b39625374c30a8d8be9e7e18f37663ba6fe44c2a66aa7b7987b140d069a
 provides="java-environment-${version}_1"
 
 # Build is still parallel, but don't use -jN.
@@ -72,14 +72,6 @@ else
 fi
 
 alternatives="
- java:/usr/bin/java:/${_jdk_home}/bin/java
- java:/usr/bin/jjs:/${_jdk_home}/bin/jjs
- java:/usr/bin/keytool:/${_jdk_home}/bin/keytool
- java:/usr/bin/pack200:/${_jdk_home}/bin/pack200
- java:/usr/bin/rmid:/${_jdk_home}/bin/rmid
- java:/usr/bin/rmiregistry:/${_jdk_home}/bin/rmiregistry
- java:/usr/bin/unpack200:/${_jdk_home}/bin/unpack200
-
  jdk:/usr/bin/jaotc:/${_jdk_home}/bin/jaotc
  jdk:/usr/bin/jar:/${_jdk_home}/bin/jar
  jdk:/usr/bin/jarsigner:/${_jdk_home}/bin/jarsigner

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PR PATCH] [Updated] openjdk11: update to 11.0.12+7, cleanup, split jre & jmods into subpkgs
  2022-04-04 16:29 [PR PATCH] openjdk11: cleanup, split jre into subpackage classabbyamp
                   ` (12 preceding siblings ...)
  2022-04-25 15:05 ` classabbyamp
@ 2022-04-25 15:10 ` classabbyamp
  2022-04-25 17:16 ` classabbyamp
                   ` (3 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: classabbyamp @ 2022-04-25 15:10 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1997 bytes --]

There is an updated pull request by classabbyamp against master on the void-packages repository

https://github.com/classabbyamp/void-packages openjdk11-cleanup
https://github.com/void-linux/void-packages/pull/36520

openjdk11: update to 11.0.12+7, cleanup, split jre & jmods into subpkgs
- openjdk11: clean up template
- New package: openjdk11-jre-11.0.12+5
- New package: openjdk11-jmods-11.0.12+5
- openjdk11: disable on armv[56]*
- openjdk11: update to 11.0.12+7, enable debug.

fixes #25183
fixes #29457
closes #36221

This should bring openjdk11 more in-line with other openjdk package templates

See [here](https://forums.raspberrypi.com/viewtopic.php?t=232680), [here](https://forums.raspberrypi.com/viewtopic.php?t=323376), and [here](https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=255662) for evidence of the arm incompatibility.

cc: @knusbaum for maintainer review

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

CI fail on aarch64 and armv7l glibc for unresolvable shlibs can be safely ignored.

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/36520.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openjdk11-cleanup-36520.patch --]
[-- Type: text/x-diff, Size: 16633 bytes --]

From 4b42a6c771bea1f2c301d7d8d3e1a04e97b5522f Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Mon, 4 Apr 2022 12:15:17 -0400
Subject: [PATCH 1/5] openjdk11: clean up template

---
 srcpkgs/openjdk11/template | 112 ++++++++++++++++++-------------------
 1 file changed, 56 insertions(+), 56 deletions(-)

diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index bd38c0c5c010..a7e3ed176e19 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -1,9 +1,9 @@
 # Template file for 'openjdk11'
 pkgname=openjdk11
 version=11.0.12+5
-revision=2
+revision=3
 _java_ver="${version%%.*}"
-_openjdk_version="openjdk-${_java_ver}"
+_jdk_home="usr/lib/jvm/openjdk${_java_ver}"
 wrksrc="jdk${_java_ver}u-jdk-${version}"
 build_style=gnu-configure
 configure_args="
@@ -32,7 +32,7 @@ makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
  fontconfig-devel zlib-devel lcms2-devel"
 depends="fontconfig"
-short_desc="OpenJDK Java Development Kit"
+short_desc="OpenJDK Java Development Kit (version ${_java_ver})"
 maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="GPL-2.0-only WITH Classpath-exception-2.0"
 homepage="http://openjdk.java.net/"
@@ -68,50 +68,50 @@ if [ ! "$CROSS_BUILD" ]; then
 	configure_args+=" --with-boot-jdk=/usr/lib/jvm/java-10-openjdk"
 else
 	hostmakedepends+=" openjdk11"
-	configure_args+=" --with-boot-jdk=/usr/lib/jvm/openjdk11"
+	configure_args+=" --with-boot-jdk=/${_jdk_home}"
 fi
 
 alternatives="
- java:/usr/bin/java:/usr/lib/jvm/openjdk11/bin/java
- java:/usr/bin/jjs:/usr/lib/jvm/openjdk11/bin/jjs
- java:/usr/bin/keytool:/usr/lib/jvm/openjdk11/bin/keytool
- java:/usr/bin/pack200:/usr/lib/jvm/openjdk11/bin/pack200
- java:/usr/bin/rmid:/usr/lib/jvm/openjdk11/bin/rmid
- java:/usr/bin/rmiregistry:/usr/lib/jvm/openjdk11/bin/rmiregistry
- java:/usr/bin/unpack200:/usr/lib/jvm/openjdk11/bin/unpack200
+ java:/usr/bin/java:/${_jdk_home}/bin/java
+ java:/usr/bin/jjs:/${_jdk_home}/bin/jjs
+ java:/usr/bin/keytool:/${_jdk_home}/bin/keytool
+ java:/usr/bin/pack200:/${_jdk_home}/bin/pack200
+ java:/usr/bin/rmid:/${_jdk_home}/bin/rmid
+ java:/usr/bin/rmiregistry:/${_jdk_home}/bin/rmiregistry
+ java:/usr/bin/unpack200:/${_jdk_home}/bin/unpack200
 
- jdk:/usr/bin/jaotc:/usr/lib/jvm/openjdk11/bin/jaotc
- jdk:/usr/bin/jar:/usr/lib/jvm/openjdk11/bin/jar
- jdk:/usr/bin/jarsigner:/usr/lib/jvm/openjdk11/bin/jarsigner
- jdk:/usr/bin/java:/usr/lib/jvm/openjdk11/bin/java
- jdk:/usr/bin/javac:/usr/lib/jvm/openjdk11/bin/javac
- jdk:/usr/bin/javadoc:/usr/lib/jvm/openjdk11/bin/javadoc
- jdk:/usr/bin/javap:/usr/lib/jvm/openjdk11/bin/javap
- jdk:/usr/bin/jcmd:/usr/lib/jvm/openjdk11/bin/jcmd
- jdk:/usr/bin/jconsole:/usr/lib/jvm/openjdk11/bin/jconsole
- jdk:/usr/bin/jdb:/usr/lib/jvm/openjdk11/bin/jdb
- jdk:/usr/bin/jdeprscan:/usr/lib/jvm/openjdk11/bin/jdeprscan
- jdk:/usr/bin/jdeps:/usr/lib/jvm/openjdk11/bin/jdeps
- jdk:/usr/bin/jhsdb:/usr/lib/jvm/openjdk11/bin/jhsdb
- jdk:/usr/bin/jimage:/usr/lib/jvm/openjdk11/bin/jimage
- jdk:/usr/bin/jinfo:/usr/lib/jvm/openjdk11/bin/jinfo
- jdk:/usr/bin/jjs:/usr/lib/jvm/openjdk11/bin/jjs
- jdk:/usr/bin/jlink:/usr/lib/jvm/openjdk11/bin/jlink
- jdk:/usr/bin/jmap:/usr/lib/jvm/openjdk11/bin/jmap
- jdk:/usr/bin/jmod:/usr/lib/jvm/openjdk11/bin/jmod
- jdk:/usr/bin/jps:/usr/lib/jvm/openjdk11/bin/jps
- jdk:/usr/bin/jrunscript:/usr/lib/jvm/openjdk11/bin/jrunscript
- jdk:/usr/bin/jshell:/usr/lib/jvm/openjdk11/bin/jshell
- jdk:/usr/bin/jstack:/usr/lib/jvm/openjdk11/bin/jstack
- jdk:/usr/bin/jstat:/usr/lib/jvm/openjdk11/bin/jstat
- jdk:/usr/bin/jstatd:/usr/lib/jvm/openjdk11/bin/jstatd
- jdk:/usr/bin/keytool:/usr/lib/jvm/openjdk11/bin/keytool
- jdk:/usr/bin/pack200:/usr/lib/jvm/openjdk11/bin/pack200
- jdk:/usr/bin/rmic:/usr/lib/jvm/openjdk11/bin/rmic
- jdk:/usr/bin/rmid:/usr/lib/jvm/openjdk11/bin/rmid
- jdk:/usr/bin/rmiregistry:/usr/lib/jvm/openjdk11/bin/rmiregistry
- jdk:/usr/bin/serialver:/usr/lib/jvm/openjdk11/bin/serialver
- jdk:/usr/bin/unpack200:/usr/lib/jvm/openjdk11/bin/unpack200
+ jdk:/usr/bin/jaotc:/${_jdk_home}/bin/jaotc
+ jdk:/usr/bin/jar:/${_jdk_home}/bin/jar
+ jdk:/usr/bin/jarsigner:/${_jdk_home}/bin/jarsigner
+ jdk:/usr/bin/java:/${_jdk_home}/bin/java
+ jdk:/usr/bin/javac:/${_jdk_home}/bin/javac
+ jdk:/usr/bin/javadoc:/${_jdk_home}/bin/javadoc
+ jdk:/usr/bin/javap:/${_jdk_home}/bin/javap
+ jdk:/usr/bin/jcmd:/${_jdk_home}/bin/jcmd
+ jdk:/usr/bin/jconsole:/${_jdk_home}/bin/jconsole
+ jdk:/usr/bin/jdb:/${_jdk_home}/bin/jdb
+ jdk:/usr/bin/jdeprscan:/${_jdk_home}/bin/jdeprscan
+ jdk:/usr/bin/jdeps:/${_jdk_home}/bin/jdeps
+ jdk:/usr/bin/jhsdb:/${_jdk_home}/bin/jhsdb
+ jdk:/usr/bin/jimage:/${_jdk_home}/bin/jimage
+ jdk:/usr/bin/jinfo:/${_jdk_home}/bin/jinfo
+ jdk:/usr/bin/jjs:/${_jdk_home}/bin/jjs
+ jdk:/usr/bin/jlink:/${_jdk_home}/bin/jlink
+ jdk:/usr/bin/jmap:/${_jdk_home}/bin/jmap
+ jdk:/usr/bin/jmod:/${_jdk_home}/bin/jmod
+ jdk:/usr/bin/jps:/${_jdk_home}/bin/jps
+ jdk:/usr/bin/jrunscript:/${_jdk_home}/bin/jrunscript
+ jdk:/usr/bin/jshell:/${_jdk_home}/bin/jshell
+ jdk:/usr/bin/jstack:/${_jdk_home}/bin/jstack
+ jdk:/usr/bin/jstat:/${_jdk_home}/bin/jstat
+ jdk:/usr/bin/jstatd:/${_jdk_home}/bin/jstatd
+ jdk:/usr/bin/keytool:/${_jdk_home}/bin/keytool
+ jdk:/usr/bin/pack200:/${_jdk_home}/bin/pack200
+ jdk:/usr/bin/rmic:/${_jdk_home}/bin/rmic
+ jdk:/usr/bin/rmid:/${_jdk_home}/bin/rmid
+ jdk:/usr/bin/rmiregistry:/${_jdk_home}/bin/rmiregistry
+ jdk:/usr/bin/serialver:/${_jdk_home}/bin/serialver
+ jdk:/usr/bin/unpack200:/${_jdk_home}/bin/unpack200
 "
 
 post_extract() {
@@ -151,11 +151,11 @@ do_configure() {
 }
 
 do_install() {
-	vmkdir usr/lib/jvm/openjdk${_java_ver}
-	vcopy build/*-normal-*-release/images/jdk/* "usr/lib/jvm/openjdk${_java_ver}"
-	vmkdir usr/lib/jvm/$_openjdk_version/lib/security
-	make-ca -g -f --destdir "${PWD}/ca" -k "${DESTDIR}/usr/lib/jvm/openjdk${_java_ver}/bin/keytool"
-	mv ./ca/etc/pki/tls/java/cacerts ${DESTDIR}/usr/lib/jvm/openjdk${_java_ver}/lib/security/
+	vmkdir $_jdk_home
+	vcopy build/*-normal-*-release/images/jdk/* $_jdk_home
+	vmkdir $_jdk_home/lib/security
+	make-ca -g -f --destdir "${PWD}/ca" -k $DESTDIR/$_jdk_home/bin/keytool
+	mv ./ca/etc/pki/tls/java/cacerts $DESTDIR/$_jdk_home/lib/security/
 	chmod -R ugo+rw ./ca
 	rm -Rf ./ca
 	vmkdir etc/profile.d
@@ -170,14 +170,14 @@ openjdk11-doc_package() {
 	nostrip=yes
 	noverifyrdeps=yes
 	noshlibprovides=yes
-	short_desc+=" -- documentation"
+	short_desc+=" - documentation"
 	pkg_install() {
 		cd ${wrksrc}
 		if [ "$build_option_docs" ]; then
 			vmkdir usr/share/doc/openjdk11
-			cp -a build/linux-*/images/docs/* ${PKGDESTDIR}/usr/share/doc/openjdk11
+			cp -a build/linux-*/images/docs/* $PKGDESTDIR/usr/share/doc/openjdk11
 		fi
-		vmove usr/lib/jvm/openjdk11/man/man1
+		vmove $_jdk_home/man/man1
 	}
 }
 
@@ -185,17 +185,17 @@ openjdk11-src_package() {
 	nostrip=yes
 	noverifyrdeps=yes
 	noshlibprovides=yes
-	short_desc+=" -- sources"
+	short_desc+=" - sources"
 	pkg_install() {
-		vmove "usr/lib/jvm/openjdk11/lib/src.zip"
+		vmove $_jdk_home/lib/src.zip
 	}
 }
 
 openjdk11-static-libs_package() {
 	notstrip=yes
-	short_desc+=" -- static libs"
+	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}"
+		vmkdir $_jdk_home
+		vcopy build/*-normal-*-release/images/static-libs/lib $_jdk_home
 	}
 }

From 4c58c4f0f0388e2ae1be6d3973260b0376449923 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Mon, 4 Apr 2022 12:25:32 -0400
Subject: [PATCH 2/5] New package: openjdk11-jre-11.0.12+5.

---
 common/shlibs              | 12 +++++------
 srcpkgs/openjdk11-jre      |  1 +
 srcpkgs/openjdk11/template | 44 ++++++++++++++++++++++++++++++++------
 3 files changed, 44 insertions(+), 13 deletions(-)
 create mode 120000 srcpkgs/openjdk11-jre

diff --git a/common/shlibs b/common/shlibs
index 073830fc1442..669c0be2844a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1810,12 +1810,12 @@ libawt_xawt.so openjdk8-jre-8u20_1
 libjava.so openjdk8-jre-8u20_1
 libjli.so openjdk8-jre-8u20_1
 libjvm.so openjdk8-jre-8u20_1
-libjawt.so openjdk11-11.0.5+10_1
-libawt.so openjdk11-11.0.5+10_1
-libawt_xawt.so openjdk11-11.0.5+10_1
-libjava.so openjdk11-11.0.5+10_1
-libjli.so openjdk11-11.0.5+10_1
-libjvm.so openjdk11-11.0.5+10_1
+libjawt.so openjdk11-jre-11.0.5+10_1
+libawt.so openjdk11-jre-11.0.5+10_1
+libawt_xawt.so openjdk11-jre-11.0.5+10_1
+libjava.so openjdk11-jre-11.0.5+10_1
+libjli.so openjdk11-jre-11.0.5+10_1
+libjvm.so openjdk11-jre-11.0.5+10_1
 libjawt.so openjdk7-bootstrap-7u221b02_1
 libawt.so openjdk7-bootstrap-7u221b02_1
 libawt_xawt.so openjdk7-bootstrap-7u221b02_1
diff --git a/srcpkgs/openjdk11-jre b/srcpkgs/openjdk11-jre
new file mode 120000
index 000000000000..8213494c49ed
--- /dev/null
+++ b/srcpkgs/openjdk11-jre
@@ -0,0 +1 @@
+openjdk11
\ No newline at end of file
diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index a7e3ed176e19..f0b16258cf9f 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -31,15 +31,14 @@ hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
 makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
  fontconfig-devel zlib-devel lcms2-devel"
-depends="fontconfig"
+depends="${pkgname}-jre-${version}_${revision}"
 short_desc="OpenJDK Java Development Kit (version ${_java_ver})"
 maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="GPL-2.0-only WITH Classpath-exception-2.0"
 homepage="http://openjdk.java.net/"
 distfiles="https://hg.openjdk.java.net/jdk-updates/jdk${_java_ver}u/archive/jdk-${version}.tar.gz"
 checksum=ff0edaf800c76ae435840365a9205a5f7277a5a2fd3c79ad874522a15c213559
-provides="java-environment-${version}_1 java-runtime-${version}_1"
-shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so"
+provides="java-environment-${version}_1"
 
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes
@@ -158,14 +157,45 @@ do_install() {
 	mv ./ca/etc/pki/tls/java/cacerts $DESTDIR/$_jdk_home/lib/security/
 	chmod -R ugo+rw ./ca
 	rm -Rf ./ca
-	vmkdir etc/profile.d
-	cat >>${DESTDIR}/etc/profile.d/10_openjdk11.sh <<EOF
-export JAVA_HOME=\${JAVA_HOME=/usr/lib/jvm/openjdk${_java_ver}}
-EOF
 	vlicense ASSEMBLY_EXCEPTION
 	vlicense LICENSE
 }
 
+subpackages="openjdk11-src openjdk11-jre openjdk11-doc openjdk11-static-libs"
+
+openjdk11-jre_package() {
+	shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so"
+	short_desc+=" - runtime components"
+	provides="java-runtime-${version}_1"
+	depends="fontconfig"
+	alternatives="
+	 java:/usr/bin/java:/${_jdk_home}/bin/java
+	 java:/usr/bin/jjs:/${_jdk_home}/bin/jjs
+	 java:/usr/bin/keytool:/${_jdk_home}/bin/keytool
+	 java:/usr/bin/pack200:/${_jdk_home}/bin/pack200
+	 java:/usr/bin/rmid:/${_jdk_home}/bin/rmid
+	 java:/usr/bin/rmiregistry:/${_jdk_home}/bin/rmiregistry
+	 java:/usr/bin/unpack200:/${_jdk_home}/bin/unpack200
+	"
+	pkg_install() {
+		for bf in java jjs keytool pack200 rmid rmiregistry unpack200; do
+			vmove $_jdk_home/bin/$bf
+		done
+
+		for f in lib legal conf release; do
+			vmove $_jdk_home/$f
+		done
+
+		vmkdir etc/profile.d
+		cat >>${PKGDESTDIR}/etc/profile.d/10_openjdk11.sh <<EOF
+export JAVA_HOME=\${JAVA_HOME=/usr/lib/jvm/openjdk${_java_ver}}
+EOF
+
+		vlicense ASSEMBLY_EXCEPTION
+		vlicense LICENSE
+	}
+}
+
 openjdk11-doc_package() {
 	nostrip=yes
 	noverifyrdeps=yes

From 969bed31e979e976ca1d7ab99bee587577c69a33 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 20 Apr 2022 19:53:06 -0400
Subject: [PATCH 3/5] New package: openjdk11-jmods-11.0.12+5

fixes #25183
---
 srcpkgs/openjdk11-jmods    |  1 +
 srcpkgs/openjdk11/template | 10 +++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/openjdk11-jmods

diff --git a/srcpkgs/openjdk11-jmods b/srcpkgs/openjdk11-jmods
new file mode 120000
index 000000000000..8213494c49ed
--- /dev/null
+++ b/srcpkgs/openjdk11-jmods
@@ -0,0 +1 @@
+openjdk11
\ No newline at end of file
diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index f0b16258cf9f..ba11f44a43c9 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -161,7 +161,7 @@ do_install() {
 	vlicense LICENSE
 }
 
-subpackages="openjdk11-src openjdk11-jre openjdk11-doc openjdk11-static-libs"
+subpackages="openjdk11-src openjdk11-jre openjdk11-doc openjdk11-jmods openjdk11-static-libs"
 
 openjdk11-jre_package() {
 	shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so"
@@ -229,3 +229,11 @@ openjdk11-static-libs_package() {
 		vcopy build/*-normal-*-release/images/static-libs/lib $_jdk_home
 	}
 }
+
+openjdk11-jmods_package() {
+	short_desc+=" - JMODs"
+	depends="${pkgname}-${version}_${revision}"
+	pkg_install() {
+		vmove $_jdk_home/jmods
+	}
+}

From a2bfb8e7c165a25f11d2661d3f4a794864e1e7e1 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 20 Apr 2022 21:24:39 -0400
Subject: [PATCH 4/5] openjdk11: disable on armv[56]*

fixes #29457
---
 srcpkgs/openjdk11/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index ba11f44a43c9..f164f5de741f 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -44,10 +44,11 @@ provides="java-environment-${version}_1"
 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

From a954981f3072ebd21c25e757a78029ddbb83ed78 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 20 Apr 2022 20:14:58 -0400
Subject: [PATCH 5/5] openjdk11: update to 11.0.12+7, enable debug.

---
 srcpkgs/openjdk11/template | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index f164f5de741f..711376c10824 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=3
+version=11.0.12+7
+revision=1
 _java_ver="${version%%.*}"
 _jdk_home="usr/lib/jvm/openjdk${_java_ver}"
 wrksrc="jdk${_java_ver}u-jdk-${version}"
@@ -16,14 +16,14 @@ configure_args="
  --with-libpng=system
  --with-lcms=system
  --with-jtreg=no
- --with-native-debug-symbols=none
+ --with-native-debug-symbols=internal
  --with-version-pre=
- --with-version-opt="void-r$revision"
+ --with-version-opt=void-r$revision
  --with-version-build=${version#*+}
- --with-vendor-name="Void"
- --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""
+ --with-vendor-name=Void
+ --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 static-libs-image $(vopt_if docs docs)"
 make_check_target="test-hotspot-gtest"
 hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
@@ -37,7 +37,7 @@ maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="GPL-2.0-only WITH Classpath-exception-2.0"
 homepage="http://openjdk.java.net/"
 distfiles="https://hg.openjdk.java.net/jdk-updates/jdk${_java_ver}u/archive/jdk-${version}.tar.gz"
-checksum=ff0edaf800c76ae435840365a9205a5f7277a5a2fd3c79ad874522a15c213559
+checksum=06ad7b39625374c30a8d8be9e7e18f37663ba6fe44c2a66aa7b7987b140d069a
 provides="java-environment-${version}_1"
 
 # Build is still parallel, but don't use -jN.
@@ -72,14 +72,6 @@ else
 fi
 
 alternatives="
- java:/usr/bin/java:/${_jdk_home}/bin/java
- java:/usr/bin/jjs:/${_jdk_home}/bin/jjs
- java:/usr/bin/keytool:/${_jdk_home}/bin/keytool
- java:/usr/bin/pack200:/${_jdk_home}/bin/pack200
- java:/usr/bin/rmid:/${_jdk_home}/bin/rmid
- java:/usr/bin/rmiregistry:/${_jdk_home}/bin/rmiregistry
- java:/usr/bin/unpack200:/${_jdk_home}/bin/unpack200
-
  jdk:/usr/bin/jaotc:/${_jdk_home}/bin/jaotc
  jdk:/usr/bin/jar:/${_jdk_home}/bin/jar
  jdk:/usr/bin/jarsigner:/${_jdk_home}/bin/jarsigner

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PR PATCH] [Updated] openjdk11: update to 11.0.12+7, cleanup, split jre & jmods into subpkgs
  2022-04-04 16:29 [PR PATCH] openjdk11: cleanup, split jre into subpackage classabbyamp
                   ` (13 preceding siblings ...)
  2022-04-25 15:10 ` classabbyamp
@ 2022-04-25 17:16 ` classabbyamp
  2022-04-25 18:46 ` classabbyamp
                   ` (2 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: classabbyamp @ 2022-04-25 17:16 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1997 bytes --]

There is an updated pull request by classabbyamp against master on the void-packages repository

https://github.com/classabbyamp/void-packages openjdk11-cleanup
https://github.com/void-linux/void-packages/pull/36520

openjdk11: update to 11.0.12+7, cleanup, split jre & jmods into subpkgs
- openjdk11: clean up template
- New package: openjdk11-jre-11.0.12+5
- New package: openjdk11-jmods-11.0.12+5
- openjdk11: disable on armv[56]*
- openjdk11: update to 11.0.12+7, enable debug.

fixes #25183
fixes #29457
closes #36221

This should bring openjdk11 more in-line with other openjdk package templates

See [here](https://forums.raspberrypi.com/viewtopic.php?t=232680), [here](https://forums.raspberrypi.com/viewtopic.php?t=323376), and [here](https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=255662) for evidence of the arm incompatibility.

cc: @knusbaum for maintainer review

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

CI fail on aarch64 and armv7l glibc for unresolvable shlibs can be safely ignored.

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/36520.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openjdk11-cleanup-36520.patch --]
[-- Type: text/x-diff, Size: 16633 bytes --]

From 4b42a6c771bea1f2c301d7d8d3e1a04e97b5522f Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Mon, 4 Apr 2022 12:15:17 -0400
Subject: [PATCH 1/5] openjdk11: clean up template

---
 srcpkgs/openjdk11/template | 112 ++++++++++++++++++-------------------
 1 file changed, 56 insertions(+), 56 deletions(-)

diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index bd38c0c5c010..a7e3ed176e19 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -1,9 +1,9 @@
 # Template file for 'openjdk11'
 pkgname=openjdk11
 version=11.0.12+5
-revision=2
+revision=3
 _java_ver="${version%%.*}"
-_openjdk_version="openjdk-${_java_ver}"
+_jdk_home="usr/lib/jvm/openjdk${_java_ver}"
 wrksrc="jdk${_java_ver}u-jdk-${version}"
 build_style=gnu-configure
 configure_args="
@@ -32,7 +32,7 @@ makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
  fontconfig-devel zlib-devel lcms2-devel"
 depends="fontconfig"
-short_desc="OpenJDK Java Development Kit"
+short_desc="OpenJDK Java Development Kit (version ${_java_ver})"
 maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="GPL-2.0-only WITH Classpath-exception-2.0"
 homepage="http://openjdk.java.net/"
@@ -68,50 +68,50 @@ if [ ! "$CROSS_BUILD" ]; then
 	configure_args+=" --with-boot-jdk=/usr/lib/jvm/java-10-openjdk"
 else
 	hostmakedepends+=" openjdk11"
-	configure_args+=" --with-boot-jdk=/usr/lib/jvm/openjdk11"
+	configure_args+=" --with-boot-jdk=/${_jdk_home}"
 fi
 
 alternatives="
- java:/usr/bin/java:/usr/lib/jvm/openjdk11/bin/java
- java:/usr/bin/jjs:/usr/lib/jvm/openjdk11/bin/jjs
- java:/usr/bin/keytool:/usr/lib/jvm/openjdk11/bin/keytool
- java:/usr/bin/pack200:/usr/lib/jvm/openjdk11/bin/pack200
- java:/usr/bin/rmid:/usr/lib/jvm/openjdk11/bin/rmid
- java:/usr/bin/rmiregistry:/usr/lib/jvm/openjdk11/bin/rmiregistry
- java:/usr/bin/unpack200:/usr/lib/jvm/openjdk11/bin/unpack200
+ java:/usr/bin/java:/${_jdk_home}/bin/java
+ java:/usr/bin/jjs:/${_jdk_home}/bin/jjs
+ java:/usr/bin/keytool:/${_jdk_home}/bin/keytool
+ java:/usr/bin/pack200:/${_jdk_home}/bin/pack200
+ java:/usr/bin/rmid:/${_jdk_home}/bin/rmid
+ java:/usr/bin/rmiregistry:/${_jdk_home}/bin/rmiregistry
+ java:/usr/bin/unpack200:/${_jdk_home}/bin/unpack200
 
- jdk:/usr/bin/jaotc:/usr/lib/jvm/openjdk11/bin/jaotc
- jdk:/usr/bin/jar:/usr/lib/jvm/openjdk11/bin/jar
- jdk:/usr/bin/jarsigner:/usr/lib/jvm/openjdk11/bin/jarsigner
- jdk:/usr/bin/java:/usr/lib/jvm/openjdk11/bin/java
- jdk:/usr/bin/javac:/usr/lib/jvm/openjdk11/bin/javac
- jdk:/usr/bin/javadoc:/usr/lib/jvm/openjdk11/bin/javadoc
- jdk:/usr/bin/javap:/usr/lib/jvm/openjdk11/bin/javap
- jdk:/usr/bin/jcmd:/usr/lib/jvm/openjdk11/bin/jcmd
- jdk:/usr/bin/jconsole:/usr/lib/jvm/openjdk11/bin/jconsole
- jdk:/usr/bin/jdb:/usr/lib/jvm/openjdk11/bin/jdb
- jdk:/usr/bin/jdeprscan:/usr/lib/jvm/openjdk11/bin/jdeprscan
- jdk:/usr/bin/jdeps:/usr/lib/jvm/openjdk11/bin/jdeps
- jdk:/usr/bin/jhsdb:/usr/lib/jvm/openjdk11/bin/jhsdb
- jdk:/usr/bin/jimage:/usr/lib/jvm/openjdk11/bin/jimage
- jdk:/usr/bin/jinfo:/usr/lib/jvm/openjdk11/bin/jinfo
- jdk:/usr/bin/jjs:/usr/lib/jvm/openjdk11/bin/jjs
- jdk:/usr/bin/jlink:/usr/lib/jvm/openjdk11/bin/jlink
- jdk:/usr/bin/jmap:/usr/lib/jvm/openjdk11/bin/jmap
- jdk:/usr/bin/jmod:/usr/lib/jvm/openjdk11/bin/jmod
- jdk:/usr/bin/jps:/usr/lib/jvm/openjdk11/bin/jps
- jdk:/usr/bin/jrunscript:/usr/lib/jvm/openjdk11/bin/jrunscript
- jdk:/usr/bin/jshell:/usr/lib/jvm/openjdk11/bin/jshell
- jdk:/usr/bin/jstack:/usr/lib/jvm/openjdk11/bin/jstack
- jdk:/usr/bin/jstat:/usr/lib/jvm/openjdk11/bin/jstat
- jdk:/usr/bin/jstatd:/usr/lib/jvm/openjdk11/bin/jstatd
- jdk:/usr/bin/keytool:/usr/lib/jvm/openjdk11/bin/keytool
- jdk:/usr/bin/pack200:/usr/lib/jvm/openjdk11/bin/pack200
- jdk:/usr/bin/rmic:/usr/lib/jvm/openjdk11/bin/rmic
- jdk:/usr/bin/rmid:/usr/lib/jvm/openjdk11/bin/rmid
- jdk:/usr/bin/rmiregistry:/usr/lib/jvm/openjdk11/bin/rmiregistry
- jdk:/usr/bin/serialver:/usr/lib/jvm/openjdk11/bin/serialver
- jdk:/usr/bin/unpack200:/usr/lib/jvm/openjdk11/bin/unpack200
+ jdk:/usr/bin/jaotc:/${_jdk_home}/bin/jaotc
+ jdk:/usr/bin/jar:/${_jdk_home}/bin/jar
+ jdk:/usr/bin/jarsigner:/${_jdk_home}/bin/jarsigner
+ jdk:/usr/bin/java:/${_jdk_home}/bin/java
+ jdk:/usr/bin/javac:/${_jdk_home}/bin/javac
+ jdk:/usr/bin/javadoc:/${_jdk_home}/bin/javadoc
+ jdk:/usr/bin/javap:/${_jdk_home}/bin/javap
+ jdk:/usr/bin/jcmd:/${_jdk_home}/bin/jcmd
+ jdk:/usr/bin/jconsole:/${_jdk_home}/bin/jconsole
+ jdk:/usr/bin/jdb:/${_jdk_home}/bin/jdb
+ jdk:/usr/bin/jdeprscan:/${_jdk_home}/bin/jdeprscan
+ jdk:/usr/bin/jdeps:/${_jdk_home}/bin/jdeps
+ jdk:/usr/bin/jhsdb:/${_jdk_home}/bin/jhsdb
+ jdk:/usr/bin/jimage:/${_jdk_home}/bin/jimage
+ jdk:/usr/bin/jinfo:/${_jdk_home}/bin/jinfo
+ jdk:/usr/bin/jjs:/${_jdk_home}/bin/jjs
+ jdk:/usr/bin/jlink:/${_jdk_home}/bin/jlink
+ jdk:/usr/bin/jmap:/${_jdk_home}/bin/jmap
+ jdk:/usr/bin/jmod:/${_jdk_home}/bin/jmod
+ jdk:/usr/bin/jps:/${_jdk_home}/bin/jps
+ jdk:/usr/bin/jrunscript:/${_jdk_home}/bin/jrunscript
+ jdk:/usr/bin/jshell:/${_jdk_home}/bin/jshell
+ jdk:/usr/bin/jstack:/${_jdk_home}/bin/jstack
+ jdk:/usr/bin/jstat:/${_jdk_home}/bin/jstat
+ jdk:/usr/bin/jstatd:/${_jdk_home}/bin/jstatd
+ jdk:/usr/bin/keytool:/${_jdk_home}/bin/keytool
+ jdk:/usr/bin/pack200:/${_jdk_home}/bin/pack200
+ jdk:/usr/bin/rmic:/${_jdk_home}/bin/rmic
+ jdk:/usr/bin/rmid:/${_jdk_home}/bin/rmid
+ jdk:/usr/bin/rmiregistry:/${_jdk_home}/bin/rmiregistry
+ jdk:/usr/bin/serialver:/${_jdk_home}/bin/serialver
+ jdk:/usr/bin/unpack200:/${_jdk_home}/bin/unpack200
 "
 
 post_extract() {
@@ -151,11 +151,11 @@ do_configure() {
 }
 
 do_install() {
-	vmkdir usr/lib/jvm/openjdk${_java_ver}
-	vcopy build/*-normal-*-release/images/jdk/* "usr/lib/jvm/openjdk${_java_ver}"
-	vmkdir usr/lib/jvm/$_openjdk_version/lib/security
-	make-ca -g -f --destdir "${PWD}/ca" -k "${DESTDIR}/usr/lib/jvm/openjdk${_java_ver}/bin/keytool"
-	mv ./ca/etc/pki/tls/java/cacerts ${DESTDIR}/usr/lib/jvm/openjdk${_java_ver}/lib/security/
+	vmkdir $_jdk_home
+	vcopy build/*-normal-*-release/images/jdk/* $_jdk_home
+	vmkdir $_jdk_home/lib/security
+	make-ca -g -f --destdir "${PWD}/ca" -k $DESTDIR/$_jdk_home/bin/keytool
+	mv ./ca/etc/pki/tls/java/cacerts $DESTDIR/$_jdk_home/lib/security/
 	chmod -R ugo+rw ./ca
 	rm -Rf ./ca
 	vmkdir etc/profile.d
@@ -170,14 +170,14 @@ openjdk11-doc_package() {
 	nostrip=yes
 	noverifyrdeps=yes
 	noshlibprovides=yes
-	short_desc+=" -- documentation"
+	short_desc+=" - documentation"
 	pkg_install() {
 		cd ${wrksrc}
 		if [ "$build_option_docs" ]; then
 			vmkdir usr/share/doc/openjdk11
-			cp -a build/linux-*/images/docs/* ${PKGDESTDIR}/usr/share/doc/openjdk11
+			cp -a build/linux-*/images/docs/* $PKGDESTDIR/usr/share/doc/openjdk11
 		fi
-		vmove usr/lib/jvm/openjdk11/man/man1
+		vmove $_jdk_home/man/man1
 	}
 }
 
@@ -185,17 +185,17 @@ openjdk11-src_package() {
 	nostrip=yes
 	noverifyrdeps=yes
 	noshlibprovides=yes
-	short_desc+=" -- sources"
+	short_desc+=" - sources"
 	pkg_install() {
-		vmove "usr/lib/jvm/openjdk11/lib/src.zip"
+		vmove $_jdk_home/lib/src.zip
 	}
 }
 
 openjdk11-static-libs_package() {
 	notstrip=yes
-	short_desc+=" -- static libs"
+	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}"
+		vmkdir $_jdk_home
+		vcopy build/*-normal-*-release/images/static-libs/lib $_jdk_home
 	}
 }

From 4c58c4f0f0388e2ae1be6d3973260b0376449923 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Mon, 4 Apr 2022 12:25:32 -0400
Subject: [PATCH 2/5] New package: openjdk11-jre-11.0.12+5.

---
 common/shlibs              | 12 +++++------
 srcpkgs/openjdk11-jre      |  1 +
 srcpkgs/openjdk11/template | 44 ++++++++++++++++++++++++++++++++------
 3 files changed, 44 insertions(+), 13 deletions(-)
 create mode 120000 srcpkgs/openjdk11-jre

diff --git a/common/shlibs b/common/shlibs
index 073830fc1442..669c0be2844a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1810,12 +1810,12 @@ libawt_xawt.so openjdk8-jre-8u20_1
 libjava.so openjdk8-jre-8u20_1
 libjli.so openjdk8-jre-8u20_1
 libjvm.so openjdk8-jre-8u20_1
-libjawt.so openjdk11-11.0.5+10_1
-libawt.so openjdk11-11.0.5+10_1
-libawt_xawt.so openjdk11-11.0.5+10_1
-libjava.so openjdk11-11.0.5+10_1
-libjli.so openjdk11-11.0.5+10_1
-libjvm.so openjdk11-11.0.5+10_1
+libjawt.so openjdk11-jre-11.0.5+10_1
+libawt.so openjdk11-jre-11.0.5+10_1
+libawt_xawt.so openjdk11-jre-11.0.5+10_1
+libjava.so openjdk11-jre-11.0.5+10_1
+libjli.so openjdk11-jre-11.0.5+10_1
+libjvm.so openjdk11-jre-11.0.5+10_1
 libjawt.so openjdk7-bootstrap-7u221b02_1
 libawt.so openjdk7-bootstrap-7u221b02_1
 libawt_xawt.so openjdk7-bootstrap-7u221b02_1
diff --git a/srcpkgs/openjdk11-jre b/srcpkgs/openjdk11-jre
new file mode 120000
index 000000000000..8213494c49ed
--- /dev/null
+++ b/srcpkgs/openjdk11-jre
@@ -0,0 +1 @@
+openjdk11
\ No newline at end of file
diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index a7e3ed176e19..f0b16258cf9f 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -31,15 +31,14 @@ hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
 makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
  fontconfig-devel zlib-devel lcms2-devel"
-depends="fontconfig"
+depends="${pkgname}-jre-${version}_${revision}"
 short_desc="OpenJDK Java Development Kit (version ${_java_ver})"
 maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="GPL-2.0-only WITH Classpath-exception-2.0"
 homepage="http://openjdk.java.net/"
 distfiles="https://hg.openjdk.java.net/jdk-updates/jdk${_java_ver}u/archive/jdk-${version}.tar.gz"
 checksum=ff0edaf800c76ae435840365a9205a5f7277a5a2fd3c79ad874522a15c213559
-provides="java-environment-${version}_1 java-runtime-${version}_1"
-shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so"
+provides="java-environment-${version}_1"
 
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes
@@ -158,14 +157,45 @@ do_install() {
 	mv ./ca/etc/pki/tls/java/cacerts $DESTDIR/$_jdk_home/lib/security/
 	chmod -R ugo+rw ./ca
 	rm -Rf ./ca
-	vmkdir etc/profile.d
-	cat >>${DESTDIR}/etc/profile.d/10_openjdk11.sh <<EOF
-export JAVA_HOME=\${JAVA_HOME=/usr/lib/jvm/openjdk${_java_ver}}
-EOF
 	vlicense ASSEMBLY_EXCEPTION
 	vlicense LICENSE
 }
 
+subpackages="openjdk11-src openjdk11-jre openjdk11-doc openjdk11-static-libs"
+
+openjdk11-jre_package() {
+	shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so"
+	short_desc+=" - runtime components"
+	provides="java-runtime-${version}_1"
+	depends="fontconfig"
+	alternatives="
+	 java:/usr/bin/java:/${_jdk_home}/bin/java
+	 java:/usr/bin/jjs:/${_jdk_home}/bin/jjs
+	 java:/usr/bin/keytool:/${_jdk_home}/bin/keytool
+	 java:/usr/bin/pack200:/${_jdk_home}/bin/pack200
+	 java:/usr/bin/rmid:/${_jdk_home}/bin/rmid
+	 java:/usr/bin/rmiregistry:/${_jdk_home}/bin/rmiregistry
+	 java:/usr/bin/unpack200:/${_jdk_home}/bin/unpack200
+	"
+	pkg_install() {
+		for bf in java jjs keytool pack200 rmid rmiregistry unpack200; do
+			vmove $_jdk_home/bin/$bf
+		done
+
+		for f in lib legal conf release; do
+			vmove $_jdk_home/$f
+		done
+
+		vmkdir etc/profile.d
+		cat >>${PKGDESTDIR}/etc/profile.d/10_openjdk11.sh <<EOF
+export JAVA_HOME=\${JAVA_HOME=/usr/lib/jvm/openjdk${_java_ver}}
+EOF
+
+		vlicense ASSEMBLY_EXCEPTION
+		vlicense LICENSE
+	}
+}
+
 openjdk11-doc_package() {
 	nostrip=yes
 	noverifyrdeps=yes

From 969bed31e979e976ca1d7ab99bee587577c69a33 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 20 Apr 2022 19:53:06 -0400
Subject: [PATCH 3/5] New package: openjdk11-jmods-11.0.12+5

fixes #25183
---
 srcpkgs/openjdk11-jmods    |  1 +
 srcpkgs/openjdk11/template | 10 +++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/openjdk11-jmods

diff --git a/srcpkgs/openjdk11-jmods b/srcpkgs/openjdk11-jmods
new file mode 120000
index 000000000000..8213494c49ed
--- /dev/null
+++ b/srcpkgs/openjdk11-jmods
@@ -0,0 +1 @@
+openjdk11
\ No newline at end of file
diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index f0b16258cf9f..ba11f44a43c9 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -161,7 +161,7 @@ do_install() {
 	vlicense LICENSE
 }
 
-subpackages="openjdk11-src openjdk11-jre openjdk11-doc openjdk11-static-libs"
+subpackages="openjdk11-src openjdk11-jre openjdk11-doc openjdk11-jmods openjdk11-static-libs"
 
 openjdk11-jre_package() {
 	shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so"
@@ -229,3 +229,11 @@ openjdk11-static-libs_package() {
 		vcopy build/*-normal-*-release/images/static-libs/lib $_jdk_home
 	}
 }
+
+openjdk11-jmods_package() {
+	short_desc+=" - JMODs"
+	depends="${pkgname}-${version}_${revision}"
+	pkg_install() {
+		vmove $_jdk_home/jmods
+	}
+}

From a2bfb8e7c165a25f11d2661d3f4a794864e1e7e1 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 20 Apr 2022 21:24:39 -0400
Subject: [PATCH 4/5] openjdk11: disable on armv[56]*

fixes #29457
---
 srcpkgs/openjdk11/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index ba11f44a43c9..f164f5de741f 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -44,10 +44,11 @@ provides="java-environment-${version}_1"
 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

From 9523413a1cdefdb1598babf43f55bed1d2e94372 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 20 Apr 2022 20:14:58 -0400
Subject: [PATCH 5/5] openjdk11: update to 11.0.12+7, enable debug.

---
 srcpkgs/openjdk11/template | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index f164f5de741f..711376c10824 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=3
+version=11.0.12+7
+revision=1
 _java_ver="${version%%.*}"
 _jdk_home="usr/lib/jvm/openjdk${_java_ver}"
 wrksrc="jdk${_java_ver}u-jdk-${version}"
@@ -16,14 +16,14 @@ configure_args="
  --with-libpng=system
  --with-lcms=system
  --with-jtreg=no
- --with-native-debug-symbols=none
+ --with-native-debug-symbols=internal
  --with-version-pre=
- --with-version-opt="void-r$revision"
+ --with-version-opt=void-r$revision
  --with-version-build=${version#*+}
- --with-vendor-name="Void"
- --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""
+ --with-vendor-name=Void
+ --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 static-libs-image $(vopt_if docs docs)"
 make_check_target="test-hotspot-gtest"
 hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
@@ -37,7 +37,7 @@ maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="GPL-2.0-only WITH Classpath-exception-2.0"
 homepage="http://openjdk.java.net/"
 distfiles="https://hg.openjdk.java.net/jdk-updates/jdk${_java_ver}u/archive/jdk-${version}.tar.gz"
-checksum=ff0edaf800c76ae435840365a9205a5f7277a5a2fd3c79ad874522a15c213559
+checksum=06ad7b39625374c30a8d8be9e7e18f37663ba6fe44c2a66aa7b7987b140d069a
 provides="java-environment-${version}_1"
 
 # Build is still parallel, but don't use -jN.
@@ -72,14 +72,6 @@ else
 fi
 
 alternatives="
- java:/usr/bin/java:/${_jdk_home}/bin/java
- java:/usr/bin/jjs:/${_jdk_home}/bin/jjs
- java:/usr/bin/keytool:/${_jdk_home}/bin/keytool
- java:/usr/bin/pack200:/${_jdk_home}/bin/pack200
- java:/usr/bin/rmid:/${_jdk_home}/bin/rmid
- java:/usr/bin/rmiregistry:/${_jdk_home}/bin/rmiregistry
- java:/usr/bin/unpack200:/${_jdk_home}/bin/unpack200
-
  jdk:/usr/bin/jaotc:/${_jdk_home}/bin/jaotc
  jdk:/usr/bin/jar:/${_jdk_home}/bin/jar
  jdk:/usr/bin/jarsigner:/${_jdk_home}/bin/jarsigner

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PR PATCH] [Updated] openjdk11: update to 11.0.12+7, cleanup, split jre & jmods into subpkgs
  2022-04-04 16:29 [PR PATCH] openjdk11: cleanup, split jre into subpackage classabbyamp
                   ` (14 preceding siblings ...)
  2022-04-25 17:16 ` classabbyamp
@ 2022-04-25 18:46 ` classabbyamp
  2022-04-27 15:14 ` classabbyamp
  2022-04-27 22:34 ` [PR PATCH] [Merged]: " leahneukirchen
  17 siblings, 0 replies; 19+ messages in thread
From: classabbyamp @ 2022-04-25 18:46 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1930 bytes --]

There is an updated pull request by classabbyamp against master on the void-packages repository

https://github.com/classabbyamp/void-packages openjdk11-cleanup
https://github.com/void-linux/void-packages/pull/36520

openjdk11: update to 11.0.12+7, cleanup, split jre & jmods into subpkgs
- openjdk11: clean up template
- New package: openjdk11-jre-11.0.12+5
- New package: openjdk11-jmods-11.0.12+5
- openjdk11: disable on armv[56]*
- openjdk11: update to 11.0.12+7, enable debug.

fixes #25183
fixes #29457
closes #36221

This should bring openjdk11 more in-line with other openjdk package templates

See [here](https://forums.raspberrypi.com/viewtopic.php?t=232680), [here](https://forums.raspberrypi.com/viewtopic.php?t=323376), and [here](https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=255662) for evidence of the arm incompatibility.

cc: @knusbaum for maintainer review

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - x86_64-musl
  - i686
  - aarch64(-musl)
  - armv7l(-musl)


[ci skip]

A patch file from https://github.com/void-linux/void-packages/pull/36520.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openjdk11-cleanup-36520.patch --]
[-- Type: text/x-diff, Size: 16633 bytes --]

From 4b42a6c771bea1f2c301d7d8d3e1a04e97b5522f Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Mon, 4 Apr 2022 12:15:17 -0400
Subject: [PATCH 1/5] openjdk11: clean up template

---
 srcpkgs/openjdk11/template | 112 ++++++++++++++++++-------------------
 1 file changed, 56 insertions(+), 56 deletions(-)

diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index bd38c0c5c010..a7e3ed176e19 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -1,9 +1,9 @@
 # Template file for 'openjdk11'
 pkgname=openjdk11
 version=11.0.12+5
-revision=2
+revision=3
 _java_ver="${version%%.*}"
-_openjdk_version="openjdk-${_java_ver}"
+_jdk_home="usr/lib/jvm/openjdk${_java_ver}"
 wrksrc="jdk${_java_ver}u-jdk-${version}"
 build_style=gnu-configure
 configure_args="
@@ -32,7 +32,7 @@ makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
  fontconfig-devel zlib-devel lcms2-devel"
 depends="fontconfig"
-short_desc="OpenJDK Java Development Kit"
+short_desc="OpenJDK Java Development Kit (version ${_java_ver})"
 maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="GPL-2.0-only WITH Classpath-exception-2.0"
 homepage="http://openjdk.java.net/"
@@ -68,50 +68,50 @@ if [ ! "$CROSS_BUILD" ]; then
 	configure_args+=" --with-boot-jdk=/usr/lib/jvm/java-10-openjdk"
 else
 	hostmakedepends+=" openjdk11"
-	configure_args+=" --with-boot-jdk=/usr/lib/jvm/openjdk11"
+	configure_args+=" --with-boot-jdk=/${_jdk_home}"
 fi
 
 alternatives="
- java:/usr/bin/java:/usr/lib/jvm/openjdk11/bin/java
- java:/usr/bin/jjs:/usr/lib/jvm/openjdk11/bin/jjs
- java:/usr/bin/keytool:/usr/lib/jvm/openjdk11/bin/keytool
- java:/usr/bin/pack200:/usr/lib/jvm/openjdk11/bin/pack200
- java:/usr/bin/rmid:/usr/lib/jvm/openjdk11/bin/rmid
- java:/usr/bin/rmiregistry:/usr/lib/jvm/openjdk11/bin/rmiregistry
- java:/usr/bin/unpack200:/usr/lib/jvm/openjdk11/bin/unpack200
+ java:/usr/bin/java:/${_jdk_home}/bin/java
+ java:/usr/bin/jjs:/${_jdk_home}/bin/jjs
+ java:/usr/bin/keytool:/${_jdk_home}/bin/keytool
+ java:/usr/bin/pack200:/${_jdk_home}/bin/pack200
+ java:/usr/bin/rmid:/${_jdk_home}/bin/rmid
+ java:/usr/bin/rmiregistry:/${_jdk_home}/bin/rmiregistry
+ java:/usr/bin/unpack200:/${_jdk_home}/bin/unpack200
 
- jdk:/usr/bin/jaotc:/usr/lib/jvm/openjdk11/bin/jaotc
- jdk:/usr/bin/jar:/usr/lib/jvm/openjdk11/bin/jar
- jdk:/usr/bin/jarsigner:/usr/lib/jvm/openjdk11/bin/jarsigner
- jdk:/usr/bin/java:/usr/lib/jvm/openjdk11/bin/java
- jdk:/usr/bin/javac:/usr/lib/jvm/openjdk11/bin/javac
- jdk:/usr/bin/javadoc:/usr/lib/jvm/openjdk11/bin/javadoc
- jdk:/usr/bin/javap:/usr/lib/jvm/openjdk11/bin/javap
- jdk:/usr/bin/jcmd:/usr/lib/jvm/openjdk11/bin/jcmd
- jdk:/usr/bin/jconsole:/usr/lib/jvm/openjdk11/bin/jconsole
- jdk:/usr/bin/jdb:/usr/lib/jvm/openjdk11/bin/jdb
- jdk:/usr/bin/jdeprscan:/usr/lib/jvm/openjdk11/bin/jdeprscan
- jdk:/usr/bin/jdeps:/usr/lib/jvm/openjdk11/bin/jdeps
- jdk:/usr/bin/jhsdb:/usr/lib/jvm/openjdk11/bin/jhsdb
- jdk:/usr/bin/jimage:/usr/lib/jvm/openjdk11/bin/jimage
- jdk:/usr/bin/jinfo:/usr/lib/jvm/openjdk11/bin/jinfo
- jdk:/usr/bin/jjs:/usr/lib/jvm/openjdk11/bin/jjs
- jdk:/usr/bin/jlink:/usr/lib/jvm/openjdk11/bin/jlink
- jdk:/usr/bin/jmap:/usr/lib/jvm/openjdk11/bin/jmap
- jdk:/usr/bin/jmod:/usr/lib/jvm/openjdk11/bin/jmod
- jdk:/usr/bin/jps:/usr/lib/jvm/openjdk11/bin/jps
- jdk:/usr/bin/jrunscript:/usr/lib/jvm/openjdk11/bin/jrunscript
- jdk:/usr/bin/jshell:/usr/lib/jvm/openjdk11/bin/jshell
- jdk:/usr/bin/jstack:/usr/lib/jvm/openjdk11/bin/jstack
- jdk:/usr/bin/jstat:/usr/lib/jvm/openjdk11/bin/jstat
- jdk:/usr/bin/jstatd:/usr/lib/jvm/openjdk11/bin/jstatd
- jdk:/usr/bin/keytool:/usr/lib/jvm/openjdk11/bin/keytool
- jdk:/usr/bin/pack200:/usr/lib/jvm/openjdk11/bin/pack200
- jdk:/usr/bin/rmic:/usr/lib/jvm/openjdk11/bin/rmic
- jdk:/usr/bin/rmid:/usr/lib/jvm/openjdk11/bin/rmid
- jdk:/usr/bin/rmiregistry:/usr/lib/jvm/openjdk11/bin/rmiregistry
- jdk:/usr/bin/serialver:/usr/lib/jvm/openjdk11/bin/serialver
- jdk:/usr/bin/unpack200:/usr/lib/jvm/openjdk11/bin/unpack200
+ jdk:/usr/bin/jaotc:/${_jdk_home}/bin/jaotc
+ jdk:/usr/bin/jar:/${_jdk_home}/bin/jar
+ jdk:/usr/bin/jarsigner:/${_jdk_home}/bin/jarsigner
+ jdk:/usr/bin/java:/${_jdk_home}/bin/java
+ jdk:/usr/bin/javac:/${_jdk_home}/bin/javac
+ jdk:/usr/bin/javadoc:/${_jdk_home}/bin/javadoc
+ jdk:/usr/bin/javap:/${_jdk_home}/bin/javap
+ jdk:/usr/bin/jcmd:/${_jdk_home}/bin/jcmd
+ jdk:/usr/bin/jconsole:/${_jdk_home}/bin/jconsole
+ jdk:/usr/bin/jdb:/${_jdk_home}/bin/jdb
+ jdk:/usr/bin/jdeprscan:/${_jdk_home}/bin/jdeprscan
+ jdk:/usr/bin/jdeps:/${_jdk_home}/bin/jdeps
+ jdk:/usr/bin/jhsdb:/${_jdk_home}/bin/jhsdb
+ jdk:/usr/bin/jimage:/${_jdk_home}/bin/jimage
+ jdk:/usr/bin/jinfo:/${_jdk_home}/bin/jinfo
+ jdk:/usr/bin/jjs:/${_jdk_home}/bin/jjs
+ jdk:/usr/bin/jlink:/${_jdk_home}/bin/jlink
+ jdk:/usr/bin/jmap:/${_jdk_home}/bin/jmap
+ jdk:/usr/bin/jmod:/${_jdk_home}/bin/jmod
+ jdk:/usr/bin/jps:/${_jdk_home}/bin/jps
+ jdk:/usr/bin/jrunscript:/${_jdk_home}/bin/jrunscript
+ jdk:/usr/bin/jshell:/${_jdk_home}/bin/jshell
+ jdk:/usr/bin/jstack:/${_jdk_home}/bin/jstack
+ jdk:/usr/bin/jstat:/${_jdk_home}/bin/jstat
+ jdk:/usr/bin/jstatd:/${_jdk_home}/bin/jstatd
+ jdk:/usr/bin/keytool:/${_jdk_home}/bin/keytool
+ jdk:/usr/bin/pack200:/${_jdk_home}/bin/pack200
+ jdk:/usr/bin/rmic:/${_jdk_home}/bin/rmic
+ jdk:/usr/bin/rmid:/${_jdk_home}/bin/rmid
+ jdk:/usr/bin/rmiregistry:/${_jdk_home}/bin/rmiregistry
+ jdk:/usr/bin/serialver:/${_jdk_home}/bin/serialver
+ jdk:/usr/bin/unpack200:/${_jdk_home}/bin/unpack200
 "
 
 post_extract() {
@@ -151,11 +151,11 @@ do_configure() {
 }
 
 do_install() {
-	vmkdir usr/lib/jvm/openjdk${_java_ver}
-	vcopy build/*-normal-*-release/images/jdk/* "usr/lib/jvm/openjdk${_java_ver}"
-	vmkdir usr/lib/jvm/$_openjdk_version/lib/security
-	make-ca -g -f --destdir "${PWD}/ca" -k "${DESTDIR}/usr/lib/jvm/openjdk${_java_ver}/bin/keytool"
-	mv ./ca/etc/pki/tls/java/cacerts ${DESTDIR}/usr/lib/jvm/openjdk${_java_ver}/lib/security/
+	vmkdir $_jdk_home
+	vcopy build/*-normal-*-release/images/jdk/* $_jdk_home
+	vmkdir $_jdk_home/lib/security
+	make-ca -g -f --destdir "${PWD}/ca" -k $DESTDIR/$_jdk_home/bin/keytool
+	mv ./ca/etc/pki/tls/java/cacerts $DESTDIR/$_jdk_home/lib/security/
 	chmod -R ugo+rw ./ca
 	rm -Rf ./ca
 	vmkdir etc/profile.d
@@ -170,14 +170,14 @@ openjdk11-doc_package() {
 	nostrip=yes
 	noverifyrdeps=yes
 	noshlibprovides=yes
-	short_desc+=" -- documentation"
+	short_desc+=" - documentation"
 	pkg_install() {
 		cd ${wrksrc}
 		if [ "$build_option_docs" ]; then
 			vmkdir usr/share/doc/openjdk11
-			cp -a build/linux-*/images/docs/* ${PKGDESTDIR}/usr/share/doc/openjdk11
+			cp -a build/linux-*/images/docs/* $PKGDESTDIR/usr/share/doc/openjdk11
 		fi
-		vmove usr/lib/jvm/openjdk11/man/man1
+		vmove $_jdk_home/man/man1
 	}
 }
 
@@ -185,17 +185,17 @@ openjdk11-src_package() {
 	nostrip=yes
 	noverifyrdeps=yes
 	noshlibprovides=yes
-	short_desc+=" -- sources"
+	short_desc+=" - sources"
 	pkg_install() {
-		vmove "usr/lib/jvm/openjdk11/lib/src.zip"
+		vmove $_jdk_home/lib/src.zip
 	}
 }
 
 openjdk11-static-libs_package() {
 	notstrip=yes
-	short_desc+=" -- static libs"
+	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}"
+		vmkdir $_jdk_home
+		vcopy build/*-normal-*-release/images/static-libs/lib $_jdk_home
 	}
 }

From 4c58c4f0f0388e2ae1be6d3973260b0376449923 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Mon, 4 Apr 2022 12:25:32 -0400
Subject: [PATCH 2/5] New package: openjdk11-jre-11.0.12+5.

---
 common/shlibs              | 12 +++++------
 srcpkgs/openjdk11-jre      |  1 +
 srcpkgs/openjdk11/template | 44 ++++++++++++++++++++++++++++++++------
 3 files changed, 44 insertions(+), 13 deletions(-)
 create mode 120000 srcpkgs/openjdk11-jre

diff --git a/common/shlibs b/common/shlibs
index 073830fc1442..669c0be2844a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1810,12 +1810,12 @@ libawt_xawt.so openjdk8-jre-8u20_1
 libjava.so openjdk8-jre-8u20_1
 libjli.so openjdk8-jre-8u20_1
 libjvm.so openjdk8-jre-8u20_1
-libjawt.so openjdk11-11.0.5+10_1
-libawt.so openjdk11-11.0.5+10_1
-libawt_xawt.so openjdk11-11.0.5+10_1
-libjava.so openjdk11-11.0.5+10_1
-libjli.so openjdk11-11.0.5+10_1
-libjvm.so openjdk11-11.0.5+10_1
+libjawt.so openjdk11-jre-11.0.5+10_1
+libawt.so openjdk11-jre-11.0.5+10_1
+libawt_xawt.so openjdk11-jre-11.0.5+10_1
+libjava.so openjdk11-jre-11.0.5+10_1
+libjli.so openjdk11-jre-11.0.5+10_1
+libjvm.so openjdk11-jre-11.0.5+10_1
 libjawt.so openjdk7-bootstrap-7u221b02_1
 libawt.so openjdk7-bootstrap-7u221b02_1
 libawt_xawt.so openjdk7-bootstrap-7u221b02_1
diff --git a/srcpkgs/openjdk11-jre b/srcpkgs/openjdk11-jre
new file mode 120000
index 000000000000..8213494c49ed
--- /dev/null
+++ b/srcpkgs/openjdk11-jre
@@ -0,0 +1 @@
+openjdk11
\ No newline at end of file
diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index a7e3ed176e19..f0b16258cf9f 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -31,15 +31,14 @@ hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
 makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
  fontconfig-devel zlib-devel lcms2-devel"
-depends="fontconfig"
+depends="${pkgname}-jre-${version}_${revision}"
 short_desc="OpenJDK Java Development Kit (version ${_java_ver})"
 maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="GPL-2.0-only WITH Classpath-exception-2.0"
 homepage="http://openjdk.java.net/"
 distfiles="https://hg.openjdk.java.net/jdk-updates/jdk${_java_ver}u/archive/jdk-${version}.tar.gz"
 checksum=ff0edaf800c76ae435840365a9205a5f7277a5a2fd3c79ad874522a15c213559
-provides="java-environment-${version}_1 java-runtime-${version}_1"
-shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so"
+provides="java-environment-${version}_1"
 
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes
@@ -158,14 +157,45 @@ do_install() {
 	mv ./ca/etc/pki/tls/java/cacerts $DESTDIR/$_jdk_home/lib/security/
 	chmod -R ugo+rw ./ca
 	rm -Rf ./ca
-	vmkdir etc/profile.d
-	cat >>${DESTDIR}/etc/profile.d/10_openjdk11.sh <<EOF
-export JAVA_HOME=\${JAVA_HOME=/usr/lib/jvm/openjdk${_java_ver}}
-EOF
 	vlicense ASSEMBLY_EXCEPTION
 	vlicense LICENSE
 }
 
+subpackages="openjdk11-src openjdk11-jre openjdk11-doc openjdk11-static-libs"
+
+openjdk11-jre_package() {
+	shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so"
+	short_desc+=" - runtime components"
+	provides="java-runtime-${version}_1"
+	depends="fontconfig"
+	alternatives="
+	 java:/usr/bin/java:/${_jdk_home}/bin/java
+	 java:/usr/bin/jjs:/${_jdk_home}/bin/jjs
+	 java:/usr/bin/keytool:/${_jdk_home}/bin/keytool
+	 java:/usr/bin/pack200:/${_jdk_home}/bin/pack200
+	 java:/usr/bin/rmid:/${_jdk_home}/bin/rmid
+	 java:/usr/bin/rmiregistry:/${_jdk_home}/bin/rmiregistry
+	 java:/usr/bin/unpack200:/${_jdk_home}/bin/unpack200
+	"
+	pkg_install() {
+		for bf in java jjs keytool pack200 rmid rmiregistry unpack200; do
+			vmove $_jdk_home/bin/$bf
+		done
+
+		for f in lib legal conf release; do
+			vmove $_jdk_home/$f
+		done
+
+		vmkdir etc/profile.d
+		cat >>${PKGDESTDIR}/etc/profile.d/10_openjdk11.sh <<EOF
+export JAVA_HOME=\${JAVA_HOME=/usr/lib/jvm/openjdk${_java_ver}}
+EOF
+
+		vlicense ASSEMBLY_EXCEPTION
+		vlicense LICENSE
+	}
+}
+
 openjdk11-doc_package() {
 	nostrip=yes
 	noverifyrdeps=yes

From 969bed31e979e976ca1d7ab99bee587577c69a33 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 20 Apr 2022 19:53:06 -0400
Subject: [PATCH 3/5] New package: openjdk11-jmods-11.0.12+5

fixes #25183
---
 srcpkgs/openjdk11-jmods    |  1 +
 srcpkgs/openjdk11/template | 10 +++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/openjdk11-jmods

diff --git a/srcpkgs/openjdk11-jmods b/srcpkgs/openjdk11-jmods
new file mode 120000
index 000000000000..8213494c49ed
--- /dev/null
+++ b/srcpkgs/openjdk11-jmods
@@ -0,0 +1 @@
+openjdk11
\ No newline at end of file
diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index f0b16258cf9f..ba11f44a43c9 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -161,7 +161,7 @@ do_install() {
 	vlicense LICENSE
 }
 
-subpackages="openjdk11-src openjdk11-jre openjdk11-doc openjdk11-static-libs"
+subpackages="openjdk11-src openjdk11-jre openjdk11-doc openjdk11-jmods openjdk11-static-libs"
 
 openjdk11-jre_package() {
 	shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so"
@@ -229,3 +229,11 @@ openjdk11-static-libs_package() {
 		vcopy build/*-normal-*-release/images/static-libs/lib $_jdk_home
 	}
 }
+
+openjdk11-jmods_package() {
+	short_desc+=" - JMODs"
+	depends="${pkgname}-${version}_${revision}"
+	pkg_install() {
+		vmove $_jdk_home/jmods
+	}
+}

From a2bfb8e7c165a25f11d2661d3f4a794864e1e7e1 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 20 Apr 2022 21:24:39 -0400
Subject: [PATCH 4/5] openjdk11: disable on armv[56]*

fixes #29457
---
 srcpkgs/openjdk11/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index ba11f44a43c9..f164f5de741f 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -44,10 +44,11 @@ provides="java-environment-${version}_1"
 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

From ecdfc910268ed39673285b9b109eee0417a9571a Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 20 Apr 2022 20:14:58 -0400
Subject: [PATCH 5/5] openjdk11: update to 11.0.12+7, enable debug.

---
 srcpkgs/openjdk11/template | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index f164f5de741f..711376c10824 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=3
+version=11.0.12+7
+revision=1
 _java_ver="${version%%.*}"
 _jdk_home="usr/lib/jvm/openjdk${_java_ver}"
 wrksrc="jdk${_java_ver}u-jdk-${version}"
@@ -16,14 +16,14 @@ configure_args="
  --with-libpng=system
  --with-lcms=system
  --with-jtreg=no
- --with-native-debug-symbols=none
+ --with-native-debug-symbols=internal
  --with-version-pre=
- --with-version-opt="void-r$revision"
+ --with-version-opt=void-r$revision
  --with-version-build=${version#*+}
- --with-vendor-name="Void"
- --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""
+ --with-vendor-name=Void
+ --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 static-libs-image $(vopt_if docs docs)"
 make_check_target="test-hotspot-gtest"
 hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
@@ -37,7 +37,7 @@ maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="GPL-2.0-only WITH Classpath-exception-2.0"
 homepage="http://openjdk.java.net/"
 distfiles="https://hg.openjdk.java.net/jdk-updates/jdk${_java_ver}u/archive/jdk-${version}.tar.gz"
-checksum=ff0edaf800c76ae435840365a9205a5f7277a5a2fd3c79ad874522a15c213559
+checksum=06ad7b39625374c30a8d8be9e7e18f37663ba6fe44c2a66aa7b7987b140d069a
 provides="java-environment-${version}_1"
 
 # Build is still parallel, but don't use -jN.
@@ -72,14 +72,6 @@ else
 fi
 
 alternatives="
- java:/usr/bin/java:/${_jdk_home}/bin/java
- java:/usr/bin/jjs:/${_jdk_home}/bin/jjs
- java:/usr/bin/keytool:/${_jdk_home}/bin/keytool
- java:/usr/bin/pack200:/${_jdk_home}/bin/pack200
- java:/usr/bin/rmid:/${_jdk_home}/bin/rmid
- java:/usr/bin/rmiregistry:/${_jdk_home}/bin/rmiregistry
- java:/usr/bin/unpack200:/${_jdk_home}/bin/unpack200
-
  jdk:/usr/bin/jaotc:/${_jdk_home}/bin/jaotc
  jdk:/usr/bin/jar:/${_jdk_home}/bin/jar
  jdk:/usr/bin/jarsigner:/${_jdk_home}/bin/jarsigner

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PR PATCH] [Updated] openjdk11: update to 11.0.12+7, cleanup, split jre & jmods into subpkgs
  2022-04-04 16:29 [PR PATCH] openjdk11: cleanup, split jre into subpackage classabbyamp
                   ` (15 preceding siblings ...)
  2022-04-25 18:46 ` classabbyamp
@ 2022-04-27 15:14 ` classabbyamp
  2022-04-27 22:34 ` [PR PATCH] [Merged]: " leahneukirchen
  17 siblings, 0 replies; 19+ messages in thread
From: classabbyamp @ 2022-04-27 15:14 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1930 bytes --]

There is an updated pull request by classabbyamp against master on the void-packages repository

https://github.com/classabbyamp/void-packages openjdk11-cleanup
https://github.com/void-linux/void-packages/pull/36520

openjdk11: update to 11.0.12+7, cleanup, split jre & jmods into subpkgs
- openjdk11: clean up template
- New package: openjdk11-jre-11.0.12+5
- New package: openjdk11-jmods-11.0.12+5
- openjdk11: disable on armv[56]*
- openjdk11: update to 11.0.12+7, enable debug.

fixes #25183
fixes #29457
closes #36221

This should bring openjdk11 more in-line with other openjdk package templates

See [here](https://forums.raspberrypi.com/viewtopic.php?t=232680), [here](https://forums.raspberrypi.com/viewtopic.php?t=323376), and [here](https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=255662) for evidence of the arm incompatibility.

cc: @knusbaum for maintainer review

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - x86_64-musl
  - i686
  - aarch64(-musl)
  - armv7l(-musl)


[ci skip]

A patch file from https://github.com/void-linux/void-packages/pull/36520.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openjdk11-cleanup-36520.patch --]
[-- Type: text/x-diff, Size: 16633 bytes --]

From e841e9522b99fac47c34b9d70e7d6e874a6fc794 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Mon, 4 Apr 2022 12:15:17 -0400
Subject: [PATCH 1/5] openjdk11: clean up template

---
 srcpkgs/openjdk11/template | 112 ++++++++++++++++++-------------------
 1 file changed, 56 insertions(+), 56 deletions(-)

diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index bd38c0c5c010..a7e3ed176e19 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -1,9 +1,9 @@
 # Template file for 'openjdk11'
 pkgname=openjdk11
 version=11.0.12+5
-revision=2
+revision=3
 _java_ver="${version%%.*}"
-_openjdk_version="openjdk-${_java_ver}"
+_jdk_home="usr/lib/jvm/openjdk${_java_ver}"
 wrksrc="jdk${_java_ver}u-jdk-${version}"
 build_style=gnu-configure
 configure_args="
@@ -32,7 +32,7 @@ makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
  fontconfig-devel zlib-devel lcms2-devel"
 depends="fontconfig"
-short_desc="OpenJDK Java Development Kit"
+short_desc="OpenJDK Java Development Kit (version ${_java_ver})"
 maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="GPL-2.0-only WITH Classpath-exception-2.0"
 homepage="http://openjdk.java.net/"
@@ -68,50 +68,50 @@ if [ ! "$CROSS_BUILD" ]; then
 	configure_args+=" --with-boot-jdk=/usr/lib/jvm/java-10-openjdk"
 else
 	hostmakedepends+=" openjdk11"
-	configure_args+=" --with-boot-jdk=/usr/lib/jvm/openjdk11"
+	configure_args+=" --with-boot-jdk=/${_jdk_home}"
 fi
 
 alternatives="
- java:/usr/bin/java:/usr/lib/jvm/openjdk11/bin/java
- java:/usr/bin/jjs:/usr/lib/jvm/openjdk11/bin/jjs
- java:/usr/bin/keytool:/usr/lib/jvm/openjdk11/bin/keytool
- java:/usr/bin/pack200:/usr/lib/jvm/openjdk11/bin/pack200
- java:/usr/bin/rmid:/usr/lib/jvm/openjdk11/bin/rmid
- java:/usr/bin/rmiregistry:/usr/lib/jvm/openjdk11/bin/rmiregistry
- java:/usr/bin/unpack200:/usr/lib/jvm/openjdk11/bin/unpack200
+ java:/usr/bin/java:/${_jdk_home}/bin/java
+ java:/usr/bin/jjs:/${_jdk_home}/bin/jjs
+ java:/usr/bin/keytool:/${_jdk_home}/bin/keytool
+ java:/usr/bin/pack200:/${_jdk_home}/bin/pack200
+ java:/usr/bin/rmid:/${_jdk_home}/bin/rmid
+ java:/usr/bin/rmiregistry:/${_jdk_home}/bin/rmiregistry
+ java:/usr/bin/unpack200:/${_jdk_home}/bin/unpack200
 
- jdk:/usr/bin/jaotc:/usr/lib/jvm/openjdk11/bin/jaotc
- jdk:/usr/bin/jar:/usr/lib/jvm/openjdk11/bin/jar
- jdk:/usr/bin/jarsigner:/usr/lib/jvm/openjdk11/bin/jarsigner
- jdk:/usr/bin/java:/usr/lib/jvm/openjdk11/bin/java
- jdk:/usr/bin/javac:/usr/lib/jvm/openjdk11/bin/javac
- jdk:/usr/bin/javadoc:/usr/lib/jvm/openjdk11/bin/javadoc
- jdk:/usr/bin/javap:/usr/lib/jvm/openjdk11/bin/javap
- jdk:/usr/bin/jcmd:/usr/lib/jvm/openjdk11/bin/jcmd
- jdk:/usr/bin/jconsole:/usr/lib/jvm/openjdk11/bin/jconsole
- jdk:/usr/bin/jdb:/usr/lib/jvm/openjdk11/bin/jdb
- jdk:/usr/bin/jdeprscan:/usr/lib/jvm/openjdk11/bin/jdeprscan
- jdk:/usr/bin/jdeps:/usr/lib/jvm/openjdk11/bin/jdeps
- jdk:/usr/bin/jhsdb:/usr/lib/jvm/openjdk11/bin/jhsdb
- jdk:/usr/bin/jimage:/usr/lib/jvm/openjdk11/bin/jimage
- jdk:/usr/bin/jinfo:/usr/lib/jvm/openjdk11/bin/jinfo
- jdk:/usr/bin/jjs:/usr/lib/jvm/openjdk11/bin/jjs
- jdk:/usr/bin/jlink:/usr/lib/jvm/openjdk11/bin/jlink
- jdk:/usr/bin/jmap:/usr/lib/jvm/openjdk11/bin/jmap
- jdk:/usr/bin/jmod:/usr/lib/jvm/openjdk11/bin/jmod
- jdk:/usr/bin/jps:/usr/lib/jvm/openjdk11/bin/jps
- jdk:/usr/bin/jrunscript:/usr/lib/jvm/openjdk11/bin/jrunscript
- jdk:/usr/bin/jshell:/usr/lib/jvm/openjdk11/bin/jshell
- jdk:/usr/bin/jstack:/usr/lib/jvm/openjdk11/bin/jstack
- jdk:/usr/bin/jstat:/usr/lib/jvm/openjdk11/bin/jstat
- jdk:/usr/bin/jstatd:/usr/lib/jvm/openjdk11/bin/jstatd
- jdk:/usr/bin/keytool:/usr/lib/jvm/openjdk11/bin/keytool
- jdk:/usr/bin/pack200:/usr/lib/jvm/openjdk11/bin/pack200
- jdk:/usr/bin/rmic:/usr/lib/jvm/openjdk11/bin/rmic
- jdk:/usr/bin/rmid:/usr/lib/jvm/openjdk11/bin/rmid
- jdk:/usr/bin/rmiregistry:/usr/lib/jvm/openjdk11/bin/rmiregistry
- jdk:/usr/bin/serialver:/usr/lib/jvm/openjdk11/bin/serialver
- jdk:/usr/bin/unpack200:/usr/lib/jvm/openjdk11/bin/unpack200
+ jdk:/usr/bin/jaotc:/${_jdk_home}/bin/jaotc
+ jdk:/usr/bin/jar:/${_jdk_home}/bin/jar
+ jdk:/usr/bin/jarsigner:/${_jdk_home}/bin/jarsigner
+ jdk:/usr/bin/java:/${_jdk_home}/bin/java
+ jdk:/usr/bin/javac:/${_jdk_home}/bin/javac
+ jdk:/usr/bin/javadoc:/${_jdk_home}/bin/javadoc
+ jdk:/usr/bin/javap:/${_jdk_home}/bin/javap
+ jdk:/usr/bin/jcmd:/${_jdk_home}/bin/jcmd
+ jdk:/usr/bin/jconsole:/${_jdk_home}/bin/jconsole
+ jdk:/usr/bin/jdb:/${_jdk_home}/bin/jdb
+ jdk:/usr/bin/jdeprscan:/${_jdk_home}/bin/jdeprscan
+ jdk:/usr/bin/jdeps:/${_jdk_home}/bin/jdeps
+ jdk:/usr/bin/jhsdb:/${_jdk_home}/bin/jhsdb
+ jdk:/usr/bin/jimage:/${_jdk_home}/bin/jimage
+ jdk:/usr/bin/jinfo:/${_jdk_home}/bin/jinfo
+ jdk:/usr/bin/jjs:/${_jdk_home}/bin/jjs
+ jdk:/usr/bin/jlink:/${_jdk_home}/bin/jlink
+ jdk:/usr/bin/jmap:/${_jdk_home}/bin/jmap
+ jdk:/usr/bin/jmod:/${_jdk_home}/bin/jmod
+ jdk:/usr/bin/jps:/${_jdk_home}/bin/jps
+ jdk:/usr/bin/jrunscript:/${_jdk_home}/bin/jrunscript
+ jdk:/usr/bin/jshell:/${_jdk_home}/bin/jshell
+ jdk:/usr/bin/jstack:/${_jdk_home}/bin/jstack
+ jdk:/usr/bin/jstat:/${_jdk_home}/bin/jstat
+ jdk:/usr/bin/jstatd:/${_jdk_home}/bin/jstatd
+ jdk:/usr/bin/keytool:/${_jdk_home}/bin/keytool
+ jdk:/usr/bin/pack200:/${_jdk_home}/bin/pack200
+ jdk:/usr/bin/rmic:/${_jdk_home}/bin/rmic
+ jdk:/usr/bin/rmid:/${_jdk_home}/bin/rmid
+ jdk:/usr/bin/rmiregistry:/${_jdk_home}/bin/rmiregistry
+ jdk:/usr/bin/serialver:/${_jdk_home}/bin/serialver
+ jdk:/usr/bin/unpack200:/${_jdk_home}/bin/unpack200
 "
 
 post_extract() {
@@ -151,11 +151,11 @@ do_configure() {
 }
 
 do_install() {
-	vmkdir usr/lib/jvm/openjdk${_java_ver}
-	vcopy build/*-normal-*-release/images/jdk/* "usr/lib/jvm/openjdk${_java_ver}"
-	vmkdir usr/lib/jvm/$_openjdk_version/lib/security
-	make-ca -g -f --destdir "${PWD}/ca" -k "${DESTDIR}/usr/lib/jvm/openjdk${_java_ver}/bin/keytool"
-	mv ./ca/etc/pki/tls/java/cacerts ${DESTDIR}/usr/lib/jvm/openjdk${_java_ver}/lib/security/
+	vmkdir $_jdk_home
+	vcopy build/*-normal-*-release/images/jdk/* $_jdk_home
+	vmkdir $_jdk_home/lib/security
+	make-ca -g -f --destdir "${PWD}/ca" -k $DESTDIR/$_jdk_home/bin/keytool
+	mv ./ca/etc/pki/tls/java/cacerts $DESTDIR/$_jdk_home/lib/security/
 	chmod -R ugo+rw ./ca
 	rm -Rf ./ca
 	vmkdir etc/profile.d
@@ -170,14 +170,14 @@ openjdk11-doc_package() {
 	nostrip=yes
 	noverifyrdeps=yes
 	noshlibprovides=yes
-	short_desc+=" -- documentation"
+	short_desc+=" - documentation"
 	pkg_install() {
 		cd ${wrksrc}
 		if [ "$build_option_docs" ]; then
 			vmkdir usr/share/doc/openjdk11
-			cp -a build/linux-*/images/docs/* ${PKGDESTDIR}/usr/share/doc/openjdk11
+			cp -a build/linux-*/images/docs/* $PKGDESTDIR/usr/share/doc/openjdk11
 		fi
-		vmove usr/lib/jvm/openjdk11/man/man1
+		vmove $_jdk_home/man/man1
 	}
 }
 
@@ -185,17 +185,17 @@ openjdk11-src_package() {
 	nostrip=yes
 	noverifyrdeps=yes
 	noshlibprovides=yes
-	short_desc+=" -- sources"
+	short_desc+=" - sources"
 	pkg_install() {
-		vmove "usr/lib/jvm/openjdk11/lib/src.zip"
+		vmove $_jdk_home/lib/src.zip
 	}
 }
 
 openjdk11-static-libs_package() {
 	notstrip=yes
-	short_desc+=" -- static libs"
+	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}"
+		vmkdir $_jdk_home
+		vcopy build/*-normal-*-release/images/static-libs/lib $_jdk_home
 	}
 }

From 64fe74dccad69de160e43dd67512568baf10d612 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Mon, 4 Apr 2022 12:25:32 -0400
Subject: [PATCH 2/5] New package: openjdk11-jre-11.0.12+5.

---
 common/shlibs              | 12 +++++------
 srcpkgs/openjdk11-jre      |  1 +
 srcpkgs/openjdk11/template | 44 ++++++++++++++++++++++++++++++++------
 3 files changed, 44 insertions(+), 13 deletions(-)
 create mode 120000 srcpkgs/openjdk11-jre

diff --git a/common/shlibs b/common/shlibs
index 60b4402c8bd2..4114151662fb 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1811,12 +1811,12 @@ libawt_xawt.so openjdk8-jre-8u20_1
 libjava.so openjdk8-jre-8u20_1
 libjli.so openjdk8-jre-8u20_1
 libjvm.so openjdk8-jre-8u20_1
-libjawt.so openjdk11-11.0.5+10_1
-libawt.so openjdk11-11.0.5+10_1
-libawt_xawt.so openjdk11-11.0.5+10_1
-libjava.so openjdk11-11.0.5+10_1
-libjli.so openjdk11-11.0.5+10_1
-libjvm.so openjdk11-11.0.5+10_1
+libjawt.so openjdk11-jre-11.0.5+10_1
+libawt.so openjdk11-jre-11.0.5+10_1
+libawt_xawt.so openjdk11-jre-11.0.5+10_1
+libjava.so openjdk11-jre-11.0.5+10_1
+libjli.so openjdk11-jre-11.0.5+10_1
+libjvm.so openjdk11-jre-11.0.5+10_1
 libjawt.so openjdk7-bootstrap-7u221b02_1
 libawt.so openjdk7-bootstrap-7u221b02_1
 libawt_xawt.so openjdk7-bootstrap-7u221b02_1
diff --git a/srcpkgs/openjdk11-jre b/srcpkgs/openjdk11-jre
new file mode 120000
index 000000000000..8213494c49ed
--- /dev/null
+++ b/srcpkgs/openjdk11-jre
@@ -0,0 +1 @@
+openjdk11
\ No newline at end of file
diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index a7e3ed176e19..f0b16258cf9f 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -31,15 +31,14 @@ hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
 makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
  fontconfig-devel zlib-devel lcms2-devel"
-depends="fontconfig"
+depends="${pkgname}-jre-${version}_${revision}"
 short_desc="OpenJDK Java Development Kit (version ${_java_ver})"
 maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="GPL-2.0-only WITH Classpath-exception-2.0"
 homepage="http://openjdk.java.net/"
 distfiles="https://hg.openjdk.java.net/jdk-updates/jdk${_java_ver}u/archive/jdk-${version}.tar.gz"
 checksum=ff0edaf800c76ae435840365a9205a5f7277a5a2fd3c79ad874522a15c213559
-provides="java-environment-${version}_1 java-runtime-${version}_1"
-shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so"
+provides="java-environment-${version}_1"
 
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes
@@ -158,14 +157,45 @@ do_install() {
 	mv ./ca/etc/pki/tls/java/cacerts $DESTDIR/$_jdk_home/lib/security/
 	chmod -R ugo+rw ./ca
 	rm -Rf ./ca
-	vmkdir etc/profile.d
-	cat >>${DESTDIR}/etc/profile.d/10_openjdk11.sh <<EOF
-export JAVA_HOME=\${JAVA_HOME=/usr/lib/jvm/openjdk${_java_ver}}
-EOF
 	vlicense ASSEMBLY_EXCEPTION
 	vlicense LICENSE
 }
 
+subpackages="openjdk11-src openjdk11-jre openjdk11-doc openjdk11-static-libs"
+
+openjdk11-jre_package() {
+	shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so"
+	short_desc+=" - runtime components"
+	provides="java-runtime-${version}_1"
+	depends="fontconfig"
+	alternatives="
+	 java:/usr/bin/java:/${_jdk_home}/bin/java
+	 java:/usr/bin/jjs:/${_jdk_home}/bin/jjs
+	 java:/usr/bin/keytool:/${_jdk_home}/bin/keytool
+	 java:/usr/bin/pack200:/${_jdk_home}/bin/pack200
+	 java:/usr/bin/rmid:/${_jdk_home}/bin/rmid
+	 java:/usr/bin/rmiregistry:/${_jdk_home}/bin/rmiregistry
+	 java:/usr/bin/unpack200:/${_jdk_home}/bin/unpack200
+	"
+	pkg_install() {
+		for bf in java jjs keytool pack200 rmid rmiregistry unpack200; do
+			vmove $_jdk_home/bin/$bf
+		done
+
+		for f in lib legal conf release; do
+			vmove $_jdk_home/$f
+		done
+
+		vmkdir etc/profile.d
+		cat >>${PKGDESTDIR}/etc/profile.d/10_openjdk11.sh <<EOF
+export JAVA_HOME=\${JAVA_HOME=/usr/lib/jvm/openjdk${_java_ver}}
+EOF
+
+		vlicense ASSEMBLY_EXCEPTION
+		vlicense LICENSE
+	}
+}
+
 openjdk11-doc_package() {
 	nostrip=yes
 	noverifyrdeps=yes

From 280efac2a94fcb2fd62db4f2e1f89e0c156c59ff Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 20 Apr 2022 19:53:06 -0400
Subject: [PATCH 3/5] New package: openjdk11-jmods-11.0.12+5

fixes #25183
---
 srcpkgs/openjdk11-jmods    |  1 +
 srcpkgs/openjdk11/template | 10 +++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/openjdk11-jmods

diff --git a/srcpkgs/openjdk11-jmods b/srcpkgs/openjdk11-jmods
new file mode 120000
index 000000000000..8213494c49ed
--- /dev/null
+++ b/srcpkgs/openjdk11-jmods
@@ -0,0 +1 @@
+openjdk11
\ No newline at end of file
diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index f0b16258cf9f..ba11f44a43c9 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -161,7 +161,7 @@ do_install() {
 	vlicense LICENSE
 }
 
-subpackages="openjdk11-src openjdk11-jre openjdk11-doc openjdk11-static-libs"
+subpackages="openjdk11-src openjdk11-jre openjdk11-doc openjdk11-jmods openjdk11-static-libs"
 
 openjdk11-jre_package() {
 	shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so"
@@ -229,3 +229,11 @@ openjdk11-static-libs_package() {
 		vcopy build/*-normal-*-release/images/static-libs/lib $_jdk_home
 	}
 }
+
+openjdk11-jmods_package() {
+	short_desc+=" - JMODs"
+	depends="${pkgname}-${version}_${revision}"
+	pkg_install() {
+		vmove $_jdk_home/jmods
+	}
+}

From 41311cc0b24d50b7ed061b7f0cb98914ecfbd771 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 20 Apr 2022 21:24:39 -0400
Subject: [PATCH 4/5] openjdk11: disable on armv[56]*

fixes #29457
---
 srcpkgs/openjdk11/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index ba11f44a43c9..f164f5de741f 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -44,10 +44,11 @@ provides="java-environment-${version}_1"
 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

From d6cd9388467b85bf891fe56e471ad9ce2a7f592f Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 20 Apr 2022 20:14:58 -0400
Subject: [PATCH 5/5] openjdk11: update to 11.0.12+7, enable debug.

---
 srcpkgs/openjdk11/template | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index f164f5de741f..711376c10824 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=3
+version=11.0.12+7
+revision=1
 _java_ver="${version%%.*}"
 _jdk_home="usr/lib/jvm/openjdk${_java_ver}"
 wrksrc="jdk${_java_ver}u-jdk-${version}"
@@ -16,14 +16,14 @@ configure_args="
  --with-libpng=system
  --with-lcms=system
  --with-jtreg=no
- --with-native-debug-symbols=none
+ --with-native-debug-symbols=internal
  --with-version-pre=
- --with-version-opt="void-r$revision"
+ --with-version-opt=void-r$revision
  --with-version-build=${version#*+}
- --with-vendor-name="Void"
- --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""
+ --with-vendor-name=Void
+ --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 static-libs-image $(vopt_if docs docs)"
 make_check_target="test-hotspot-gtest"
 hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
@@ -37,7 +37,7 @@ maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="GPL-2.0-only WITH Classpath-exception-2.0"
 homepage="http://openjdk.java.net/"
 distfiles="https://hg.openjdk.java.net/jdk-updates/jdk${_java_ver}u/archive/jdk-${version}.tar.gz"
-checksum=ff0edaf800c76ae435840365a9205a5f7277a5a2fd3c79ad874522a15c213559
+checksum=06ad7b39625374c30a8d8be9e7e18f37663ba6fe44c2a66aa7b7987b140d069a
 provides="java-environment-${version}_1"
 
 # Build is still parallel, but don't use -jN.
@@ -72,14 +72,6 @@ else
 fi
 
 alternatives="
- java:/usr/bin/java:/${_jdk_home}/bin/java
- java:/usr/bin/jjs:/${_jdk_home}/bin/jjs
- java:/usr/bin/keytool:/${_jdk_home}/bin/keytool
- java:/usr/bin/pack200:/${_jdk_home}/bin/pack200
- java:/usr/bin/rmid:/${_jdk_home}/bin/rmid
- java:/usr/bin/rmiregistry:/${_jdk_home}/bin/rmiregistry
- java:/usr/bin/unpack200:/${_jdk_home}/bin/unpack200
-
  jdk:/usr/bin/jaotc:/${_jdk_home}/bin/jaotc
  jdk:/usr/bin/jar:/${_jdk_home}/bin/jar
  jdk:/usr/bin/jarsigner:/${_jdk_home}/bin/jarsigner

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PR PATCH] [Merged]: openjdk11: update to 11.0.12+7, cleanup, split jre & jmods into subpkgs
  2022-04-04 16:29 [PR PATCH] openjdk11: cleanup, split jre into subpackage classabbyamp
                   ` (16 preceding siblings ...)
  2022-04-27 15:14 ` classabbyamp
@ 2022-04-27 22:34 ` leahneukirchen
  17 siblings, 0 replies; 19+ messages in thread
From: leahneukirchen @ 2022-04-27 22:34 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1754 bytes --]

There's a merged pull request on the void-packages repository

openjdk11: update to 11.0.12+7, cleanup, split jre & jmods into subpkgs
https://github.com/void-linux/void-packages/pull/36520

Description:
- openjdk11: clean up template
- New package: openjdk11-jre-11.0.12+5
- New package: openjdk11-jmods-11.0.12+5
- openjdk11: disable on armv[56]*
- openjdk11: update to 11.0.12+7, enable debug.

fixes #25183
fixes #29457
closes #36221

This should bring openjdk11 more in-line with other openjdk package templates

See [here](https://forums.raspberrypi.com/viewtopic.php?t=232680), [here](https://forums.raspberrypi.com/viewtopic.php?t=323376), and [here](https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=255662) for evidence of the arm incompatibility.

cc: @knusbaum for maintainer review

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - x86_64-musl
  - i686
  - aarch64(-musl)
  - armv7l(-musl)


[ci skip]

^ permalink raw reply	[flat|nested] 19+ messages in thread

end of thread, other threads:[~2022-04-27 22:34 UTC | newest]

Thread overview: 19+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-04 16:29 [PR PATCH] openjdk11: cleanup, split jre into subpackage classabbyamp
2022-04-04 16:31 ` [PR PATCH] [Updated] " classabbyamp
2022-04-04 16:36 ` classabbyamp
2022-04-04 17:47 ` classabbyamp
2022-04-04 19:58 ` classabbyamp
2022-04-04 21:04 ` classabbyamp
2022-04-19 15:30 ` classabbyamp
2022-04-20  2:26 ` classabbyamp
2022-04-20 23:54 ` classabbyamp
2022-04-21  0:15 ` [PR PATCH] [Updated] openjdk11: cleanup, split jre, jmods " classabbyamp
2022-04-21  1:25 ` [PR PATCH] [Updated] openjdk11: update to 11.0.12+7, cleanup, split jre & jmods into subpkgs classabbyamp
2022-04-21  1:28 ` classabbyamp
2022-04-21  3:31 ` classabbyamp
2022-04-25 15:05 ` classabbyamp
2022-04-25 15:10 ` classabbyamp
2022-04-25 17:16 ` classabbyamp
2022-04-25 18:46 ` classabbyamp
2022-04-27 15:14 ` classabbyamp
2022-04-27 22:34 ` [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).