mirror of
https://github.com/void-linux/void-packages.git
synced 2025-06-05 06:33:50 +02:00
openjdk11: move /etc/profile.d/10-openjdk*.sh to trigger
This commit is contained in:
parent
259cbdc15d
commit
5fee6cd20a
1 changed files with 3 additions and 7 deletions
|
@ -1,7 +1,7 @@
|
||||||
# Template file for 'openjdk11'
|
# Template file for 'openjdk11'
|
||||||
pkgname=openjdk11
|
pkgname=openjdk11
|
||||||
version=11.0.12+7
|
version=11.0.12+7
|
||||||
revision=1
|
revision=2
|
||||||
_java_ver="${version%%.*}"
|
_java_ver="${version%%.*}"
|
||||||
_jdk_home="usr/lib/jvm/openjdk${_java_ver}"
|
_jdk_home="usr/lib/jvm/openjdk${_java_ver}"
|
||||||
wrksrc="jdk${_java_ver}u-jdk-${version}"
|
wrksrc="jdk${_java_ver}u-jdk-${version}"
|
||||||
|
@ -160,7 +160,8 @@ openjdk11-jre_package() {
|
||||||
shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so"
|
shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so"
|
||||||
short_desc+=" - runtime components"
|
short_desc+=" - runtime components"
|
||||||
provides="java-runtime-${version}_1"
|
provides="java-runtime-${version}_1"
|
||||||
depends="fontconfig"
|
depends="fontconfig xbps-triggers>=0.122_1"
|
||||||
|
triggers="openjdk-profile"
|
||||||
alternatives="
|
alternatives="
|
||||||
java:/usr/bin/java:/${_jdk_home}/bin/java
|
java:/usr/bin/java:/${_jdk_home}/bin/java
|
||||||
java:/usr/bin/jjs:/${_jdk_home}/bin/jjs
|
java:/usr/bin/jjs:/${_jdk_home}/bin/jjs
|
||||||
|
@ -179,11 +180,6 @@ openjdk11-jre_package() {
|
||||||
vmove $_jdk_home/$f
|
vmove $_jdk_home/$f
|
||||||
done
|
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 ASSEMBLY_EXCEPTION
|
||||||
vlicense LICENSE
|
vlicense LICENSE
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue