openjdk: update to jdk8u152b03.

This commit is contained in:
Toyam Cox 2017-04-23 20:06:41 -04:00
parent 59caf60dd3
commit 047524211f

View file

@ -5,14 +5,15 @@
# TODO: find giflib patch for --with-giflib=system # TODO: find giflib patch for --with-giflib=system
_java_ver=8 _java_ver=8
_jdk_update=121 _jdk_update=152
_jdk_build=13 _jdk_build=03
_repo_ver="jdk${_java_ver}u${_jdk_update}-b${_jdk_build}" _main_ver=${_java_ver}u${_jdk_update}
_openjdk_version="openjdk-1.8.0_${_jdk_update}" _openjdk_version="openjdk-1.8.0_${_jdk_update}"
pkgname=openjdk pkgname=openjdk
version=${_java_ver}u${_jdk_update} version="jdk${_java_ver}u${_jdk_update}b${_jdk_build}"
revision=2 revision=1
_repo_ver="${version/b/-b}"
nocross=yes nocross=yes
nopie=yes nopie=yes
wrksrc=jdk8u-jdk8u${_jdk_update}-b${_jdk_build}/ wrksrc=jdk8u-jdk8u${_jdk_update}-b${_jdk_build}/
@ -55,14 +56,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="7b59600a2a19f63dda188cd19a4fd7a7f467a6f7ce3474df0cb3005ba8a540db checksum="e5719264ea5370815c233bb8f055eacef4e4aaaef971fb84f731926ce9bc20f6
0fa534d45890b8cfb92c6ed39d2d80c60901e9e17c440fc8abf2f57a730dae2f 6968085c367e832a4b166daab89eaf61bb58acbe8d930a3d944ff2327bd846a2
1a8af5e51986046827fccfcda94f9fc41738667c67a71e5c78936d4906939255 183f958982b2a1c4f10fc834ae8e8d4ac254bf1a65373fd001ab4e58a99b0983
594f5e1c7cdffa97c1686115d9db3c7f40049d9f1dfc05cd171947fe6c20c681 ea44540bf90913ba5d122b093005d6e2ebfb0a07535187dc71f1cda639b8d185
b1a774d15fea52d0e7308981853c25cd88ffe7ff68a0bf61a518c44e77bcf2ad f3d8c2342970c229985d32bb49e84d007f50df5a6b27991b8e1473ff45832bfc
31ef7c27c2f1fb78ce6be5c96b0b5435cd814868f2b7a05a2ed3c5c062596c9d 843a397b1d610db27b378d006ade2d98ce53d5e1f7952bf64fa865f0119e6fd0
08da4dcb698a0ba2d7a417732823a2797c38f3e267a95829ee2403c4b1ad456e 4d336740d2e94d2406eb310acc64b95332e5f276143e38efe663f42f67601e7b
ec388bdb56ca5886312e4a8c75aeb703102c04f86011c4e4d911a7896fa4d5a5" 7f94034dd260c5f14a8cf3ef66b05452ca991e3d0e7a22a5513385124a8c8fc4"
# 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
@ -136,13 +137,6 @@ if [ ${XBPS_GCC_VERSION_MAJOR} -gt 5 ]; then
CFLAGS+=" -Wno-error -std=c++98 -fno-delete-null-pointer-checks -fno-lifetime-dse" CFLAGS+=" -Wno-error -std=c++98 -fno-delete-null-pointer-checks -fno-lifetime-dse"
fi fi
do_build() {
# -D_FORTIFY_SOURCE=2 doesn't work with CXX_O_FLAG_NONE="-O0"
CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=2/}
CXXFLAGS=${CXXFLAGS/-D_FORTIFY_SOURCE=2/}
make ${makejobs} ${make_build_args}
}
post_extract() { post_extract() {
if [ ${XBPS_GCC_VERSION_MAJOR} -gt 5 ]; then if [ ${XBPS_GCC_VERSION_MAJOR} -gt 5 ]; then
cd ${XBPS_BUILDDIR}/jdk-${_repo_ver} cd ${XBPS_BUILDDIR}/jdk-${_repo_ver}
@ -166,6 +160,13 @@ post_extract() {
-e "/SUPPORTED_OS_VERSION =/s;\(.*\);\1 4% 4.1%;" -e "/SUPPORTED_OS_VERSION =/s;\(.*\);\1 4% 4.1%;"
} }
do_build() {
# -D_FORTIFY_SOURCE=2 doesn't work with CXX_O_FLAG_NONE="-O0"
CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=2/}
CXXFLAGS=${CXXFLAGS/-D_FORTIFY_SOURCE=2/}
make ${makejobs} ${make_build_args}
}
post_install() { post_install() {
rm -rf ${DESTDIR}/usr/lib/bin rm -rf ${DESTDIR}/usr/lib/bin
vinstall ${FILESDIR}/mkcacerts 755 usr/lib/jvm/$_openjdk_version/jre/bin vinstall ${FILESDIR}/mkcacerts 755 usr/lib/jvm/$_openjdk_version/jre/bin