openjdk: update to 8u40.
This commit is contained in:
parent
a391a1c617
commit
9927197a65
1 changed files with 22 additions and 23 deletions
|
@ -4,8 +4,8 @@
|
|||
# TODO: find giflib patch for --with-giflib=system
|
||||
|
||||
_java_ver=8
|
||||
_jdk_update=25
|
||||
_jdk_build=17
|
||||
_jdk_update=40
|
||||
_jdk_build=15
|
||||
_repo_ver="jdk${_java_ver}u${_jdk_update}-b${_jdk_build}"
|
||||
_openjdk_version="openjdk-1.8.0_${_jdk_update}"
|
||||
|
||||
|
@ -24,18 +24,18 @@ configure_args="
|
|||
--enable-unlimited-crypto
|
||||
--with-zlib=system
|
||||
$(vopt_if oracle_bootstrap --with-boot-jdk=/usr/lib/jvm/oracle-jdk \
|
||||
--with-boot-jdk=/usr/lib/jvm/openjdk)"
|
||||
--with-boot-jdk=/usr/lib/jvm/openjdk)"
|
||||
make_build_args="DEBUG_BINARIES=true docs all"
|
||||
hostmakedepends="pkg-config cpio unzip zip"
|
||||
case "$XBPS_MACHINE" in
|
||||
arm*) hostmakedepends+=" $(vopt_if oracle_bootstrap oracle-jdk-arm openjdk)";;
|
||||
*) hostmakedepends+=" $(vopt_if oracle_bootstrap oracle-jdk openjdk)";;
|
||||
esac
|
||||
makedepends="libXrender-devel libXtst-devel libXt-devel
|
||||
makedepends="libXrender-devel libXtst-devel libXt-devel
|
||||
libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel"
|
||||
case "$XBPS_TARGET_MACHINE" in
|
||||
arm*)
|
||||
makedepends+=" libffi-devel"
|
||||
makedepends+=" libffi-devel"
|
||||
configure_args+=" --with-jvm-variants=zero"
|
||||
esac
|
||||
depends="openjdk-jre-${version}_${revision}"
|
||||
|
@ -57,15 +57,14 @@ distfiles="
|
|||
http://hg.openjdk.java.net/jdk8u/jdk8u/langtools/archive/${_repo_ver}.tar.gz>langtools-${_repo_ver}.tar.gz
|
||||
http://hg.openjdk.java.net/jdk8u/jdk8u/nashorn/archive/${_repo_ver}.tar.gz>nashorn-${_repo_ver}.tar.gz"
|
||||
|
||||
checksum="
|
||||
b4d129c0f50177e662b69632112563afb02a4f404975440b43b8529c1a1cb05b
|
||||
ce14bda33a3a23a245dd0fb2cda6d9fda98bc16dff504756e811c70884d98950
|
||||
a6480325f873a8c475bac35e4e23d388fb1619a21b0a37c78ef9a7eeed96846d
|
||||
bc5463d3808136e0fc0d94443a6f3353c74328530d0782938c6ed7aadf1245d0
|
||||
dbd29c10441b7308b141a2a2924f77c71afdda64294ace9ff749e84c00afb121
|
||||
c3bcf90cba225ba6a3f68dcbc457c78fe06042c2d599e36baef5890f6b152d8c
|
||||
c6facc858d591bf1c6372b69179ef0faee789c288da991d3dc3d706c3ad746ab
|
||||
e5949f7a9732759175f465a4c929b55a2561f0c3e49ec84460f0a21f2c67ea29"
|
||||
checksum="5e97a8f7da9891584874a2167b0da0bed681d043359c9d45a2fb23d4b9d4837b
|
||||
27f80714e74731a5468ff36ac09d505a4853adb6aed2c0d42e5dea2f7369f3d0
|
||||
f37c3bd1da59179bf9b0e16256d6cce075e135efb073e34eb85e939158c41b74
|
||||
b0b0830d0db5dac65934e8f6fe7b95f638cfb5f95a906c8660e34826dfec60d8
|
||||
3a980f14373899bbfb7217b514313562e3e75cca3d538eae41a39f61dcf91bab
|
||||
74f816d59cc9e95c26732a44010185a21939b752da337b075f1b6b1f5a677631
|
||||
f80960114b8148878c36c8210013100e3f2fcad08d245c21a32eacdb468c0dab
|
||||
daed783d035ca241f41c81691c29a0c49948f7c724e81b5c36aa21f38c3e5fe2"
|
||||
|
||||
# Build is still parallel, but don't use -jN.
|
||||
disable_parallel_build=yes
|
||||
|
@ -93,10 +92,10 @@ post_install() {
|
|||
}
|
||||
|
||||
openjdk-jre_package() {
|
||||
short_desc="OpenJDK Java Runtime Environment"
|
||||
short_desc="OpenJDK Java Runtime Environment"
|
||||
provides="java-runtime-${version}_1"
|
||||
replaces="java-runtime>=0"
|
||||
pkg_install() {
|
||||
pkg_install() {
|
||||
vmove "usr/lib/jvm/$_openjdk_version/jre"
|
||||
ln -s $_openjdk_version ${PKGDESTDIR}/usr/lib/jvm/openjdk
|
||||
vmkdir etc/profile.d
|
||||
|
@ -104,21 +103,21 @@ openjdk-jre_package() {
|
|||
export JAVA_HOME=\${JAVA_HOME=/usr/lib/jvm/$_openjdk_version/jre}
|
||||
export PATH="\$PATH:/usr/lib/jvm/$_openjdk_version/jre/bin:/usr/lib/jvm/$_openjdk_version/bin"
|
||||
EOF
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
openjdk-src_package() {
|
||||
short_desc+=" -- sources"
|
||||
pkg_install() {
|
||||
short_desc+=" -- sources"
|
||||
pkg_install() {
|
||||
vmove "usr/lib/jvm/$_openjdk_version/src.zip"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
openjdk-doc_package() {
|
||||
short_desc+=" -- documentation"
|
||||
pkg_install() {
|
||||
short_desc+=" -- documentation"
|
||||
pkg_install() {
|
||||
cd ${wrksrc}
|
||||
vmkdir usr/share/doc
|
||||
cp -a build/linux-*/docs/* ${PKGDESTDIR}/usr/share/doc
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue