Commit b2b20340 authored by Simon F's avatar Simon F Committed by Milan P. Stanić
Browse files

community/openjdk8: change install location to match other distros

Also add a compatibility symlink to the previous location
parent f63d2866
......@@ -6,7 +6,7 @@ _icedteaver=3.17.0
# pkgver is <JDK version>.<JDK update>.<JDK build>
# Check https://icedtea.classpath.org/wiki/Main_Page when updating!
pkgver=8.272.10
pkgrel=2
pkgrel=3
pkgdesc="OpenJDK 8 provided by IcedTea"
url="https://icedtea.classpath.org/"
# no bootstrap JDK on mips
......@@ -49,6 +49,7 @@ makedepends="
pcsc-lite-dev
sed
util-linux
xz
zip
zlib-dev
"
......@@ -67,7 +68,7 @@ x86|x86_64|aarch64)
esac
_bootstrap_java_home="/usr/lib/jvm/java-1.7-openjdk"
_java_home="/usr/lib/jvm/java-1.8-openjdk"
_java_home="/usr/lib/jvm/java-8-openjdk"
_jrelib="$_java_home/jre/lib/$_jarch"
# Exclude xawt from ldpath to avoid duplicate provides for libmawt.so
......@@ -347,6 +348,7 @@ jrebase() {
mkdir -p "$subpkgdir"/$_java_home/bin \
"$subpkgdir"/$_java_home/lib/$_jarch
ln -s java-8-openjdk "$subpkgdir"/usr/lib/jvm/java-1.8-openjdk
mv "$pkgdir"/$_java_home/lib/$_jarch/jli \
"$subpkgdir"/$_java_home/lib/$_jarch/
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment