openjdk17: update to 17.0.10+6.

- fix manpages
- fix alternatives
This commit is contained in:
classabbyamp 2023-12-21 17:44:04 -05:00 committed by classabbyamp
parent 16608a103b
commit 5fa5053aeb

View file

@ -1,6 +1,6 @@
# Template file for 'openjdk17'
pkgname=openjdk17
version=17.0.10+2
version=17.0.10+6
revision=1
_gtest_ver=1.8.1
_java_ver="${version%%.*}"
@ -45,8 +45,9 @@ license="GPL-2.0-only WITH Classpath-exception-2.0"
homepage="http://openjdk.java.net/"
distfiles="https://github.com/openjdk/jdk${_java_ver}u/archive/jdk-${version}.tar.gz
https://github.com/google/googletest/archive/refs/tags/release-${_gtest_ver}.tar.gz"
checksum="dbe68a64c43c3e376abd9d03758a487ecfb9c7bf1fe71cf6c2ca113f909be1cb
checksum="3d5ef3a18c4edfa6e2a16c74d9e771b09eed433006b1380df450aa88725c7238
9bf1fe5182a604b4135edc1a425ae356c9ad15e9b23f9f12a02e80184c3a249c"
alternatives="jdk:/usr/lib/jvm/default-jdk:/${_jdk_home}"
provides="java-environment-${version}_1"
patch_args="-Np1 --directory=$build_wrksrc"
@ -83,37 +84,6 @@ else
configure_args+=" --with-boot-jdk=/usr/lib/jvm/openjdk17"
fi
alternatives="
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/jfr:/${_jdk_home}/bin/jfr
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/jlink:/${_jdk_home}/bin/jlink
jdk:/usr/bin/jmap:/${_jdk_home}/bin/jmap
jdk:/usr/bin/jmod:/${_jdk_home}/bin/jmod
jdk:/usr/bin/jpackage:/${_jdk_home}/bin/jpackage
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/rmiregistry:/${_jdk_home}/bin/rmiregistry
jdk:/usr/bin/serialver:/${_jdk_home}/bin/serialver
"
post_extract() {
chmod +x $build_wrksrc/configure
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
@ -173,17 +143,12 @@ openjdk17-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="xbps-triggers>=0.122_1"
triggers="openjdk-profile"
alternatives="
java:/usr/bin/java:/${_jdk_home}/bin/java
java:/usr/bin/jfr:/${_jdk_home}/bin/jfr
java:/usr/bin/keytool:/${_jdk_home}/bin/keytool
java:/usr/bin/rmiregistry:/${_jdk_home}/bin/rmiregistry
"
depends="openjdk-common"
alternatives="java:/usr/lib/jvm/default-jre:/${_jdk_home}"
pkg_install() {
for bf in java jfr keytool rmiregistry; do
vmove $_jdk_home/bin/$bf
for bin in java jfr keytool rmiregistry; do
vmove "${_jdk_home}/bin/${bin}"
vmove "${_jdk_home}/man/man1/${bin}.1"
done
for f in lib legal conf release; do
@ -200,13 +165,15 @@ openjdk17-doc_package() {
noverifyrdeps=yes
noshlibprovides=yes
short_desc+=" - documentation"
if [ -z "$build_option_docs" ]; then
build_style=meta
fi
pkg_install() {
if [ "$build_option_docs" ]; then
local _docdir=usr/share/doc/openjdk$_java_ver
vmkdir $_docdir
cp -a $wrksrc/$build_wrksrc/build/linux-*/images/docs/* ${PKGDESTDIR}/$_docdir
fi
vmove $_jdk_home/man/man1
}
}