From ee41720b7a32b17dc42578c48ac10ac5404408ca Mon Sep 17 00:00:00 2001 From: classabbyamp 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 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 " 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 <>${PKGDESTDIR}/etc/profile.d/10_openjdk11.sh < 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 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 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 " 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