mirror of
https://github.com/void-linux/void-packages.git
synced 2025-06-05 06:33:50 +02:00
openjdk11: use p11-kit directly instead of make-ca
This commit is contained in:
parent
cdb97532e3
commit
442bebb347
1 changed files with 4 additions and 5 deletions
|
@ -28,7 +28,7 @@ configure_args="
|
||||||
make_build_args="images static-libs-image $(vopt_if docs docs)"
|
make_build_args="images static-libs-image $(vopt_if docs docs)"
|
||||||
make_check_target="test-hotspot-gtest"
|
make_check_target="test-hotspot-gtest"
|
||||||
hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
|
hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
|
||||||
openssl zlib-devel which make-ca"
|
openssl zlib-devel which p11-kit"
|
||||||
makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
|
makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
|
||||||
giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
|
giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
|
||||||
fontconfig-devel zlib-devel lcms2-devel"
|
fontconfig-devel zlib-devel lcms2-devel"
|
||||||
|
@ -113,11 +113,10 @@ do_configure() {
|
||||||
do_install() {
|
do_install() {
|
||||||
vmkdir $_jdk_home
|
vmkdir $_jdk_home
|
||||||
vcopy build/*-normal-*-release/images/jdk/* $_jdk_home
|
vcopy build/*-normal-*-release/images/jdk/* $_jdk_home
|
||||||
|
|
||||||
vmkdir $_jdk_home/lib/security
|
vmkdir $_jdk_home/lib/security
|
||||||
make-ca -g -f --destdir "${PWD}/ca" -k $DESTDIR/$_jdk_home/bin/keytool
|
trust extract --overwrite --filter=ca-anchors --format=java-cacerts --purpose server-auth "${DESTDIR}/${_jdk_home}/lib/security/cacerts"
|
||||||
mv ./ca/etc/pki/tls/java/cacerts $DESTDIR/$_jdk_home/lib/security/
|
|
||||||
chmod -R ugo+rw ./ca
|
|
||||||
rm -Rf ./ca
|
|
||||||
vlicense ASSEMBLY_EXCEPTION
|
vlicense ASSEMBLY_EXCEPTION
|
||||||
vlicense LICENSE
|
vlicense LICENSE
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue