openjdk: update to 8u40.

This commit is contained in:
Christian Neukirchen 2014-11-22 22:04:11 +01:00
parent a391a1c617
commit 9927197a65

View File

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