This update is a bit more then just upstream fixes from u202 though u212.
In addition to those upstream fixes, it includes a bunch of FreeBSD port
patches that were merged into the bsd-port upstream repo. I don't
anticipate any fallout or regressions from those changes however I'd
like to get a bulk build test with this on i386 and amd64 before
committing.
Update to u212:
* Contains many upstream bug fixes and security fixes which
can be mined from u202-u212 release notes here:
https://adoptopenjdk.net/release_notes.html
* Also contains a series of FreeBSD corrections merged into upstream
repo.
* Remove jre package since jre package support was removed from
java.port.mk and javaPathHelper already
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/jdk/1.8/Makefile,v
retrieving revision 1.42
diff -u -p -u -p -r1.42 Makefile
--- Makefile 28 May 2019 17:37:40 -0000 1.42
+++ Makefile 2 Jun 2019 18:23:51 -0000
@@ -4,33 +4,30 @@ ONLY_FOR_ARCHS= i386 amd64
USE_WXNEEDED= Yes
DPB_PROPERTIES= parallel
-COMMENT-main= OpenJDK Software Development Kit v${V}
-COMMENT-jre= OpenJDK Runtime Environment v${V}
-U= 202
-V= 1.8.0.${U}
-B= b08
+COMMENT= OpenJDK Software Development Kit v${V}
+BASE_VER= 1.8.0
+UPDATE_VER= 212
+BUILD_VER= b04
+BSD_PORT_REL= 1
+V= ${BASE_VER}.${UPDATE_VER}.${BUILD_VER}.${BSD_PORT_REL}
PKGNAME= jdk-${V}
-PKGNAME-main= jdk-${V}
-PKGNAME-jre= jre-${V}
+PKGSTEM= jdk-${BASE_VER}
EPOCH= 0
-REVISION= 0
DIST_SUBDIR= jdk
-DISTNAME= openjdk-8u202b08-bsd-port-20190310
+DISTNAME= jdk8u${UPDATE_VER}-${BUILD_VER}.${BSD_PORT_REL}
BOOTJDK_DATE= 20190111
-EXTRACT_SUFX= .tar.xz
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
+WRKDIST= ${WRKDIR}/openjdk-jdk8u-jdk8u${UPDATE_VER}-${BUILD_VER}.${BSD_PORT_REL}
CATEGORIES= devel/jdk java
-MULTI_PACKAGES= -main -jre
-
PSEUDO_FLAVORS= native_bootstrap
FLAVOR?=
HOMEPAGE= http://openjdk.java.net/
-MASTER_SITES= http://www.intricatesoftware.com/distfiles/
+MASTER_SITES= https://github.com/battleblow/openjdk-jdk8u/archive/
MASTER_SITES1= https://spacehopper.org/mirrors/ \
http://www.intricatesoftware.com/distfiles/
MASTER_SITES2= ${MASTER_SITE_APACHE:=ant/binaries/} \
@@ -48,7 +45,7 @@ SUPDISTFILES+= openjdk8-bootjdk-i386-${B
openjdk8-bootjdk-amd64-${BOOTJDK_DATE}.tar.gz:1 \
${APACHE_ANT}:2
-COMPILER = base-clang ports-gcc base-gcc
+COMPILER= base-clang ports-gcc base-gcc
.include <bsd.port.arch.mk>
@@ -92,6 +89,7 @@ CONFIGURE_STYLE=gnu
CONFIGURE_ARGS= --disable-option-checking \
--with-boot-jdk=${BOOT_JDK} \
--with-package-path=${LOCALBASE} \
+ --with-fontconfig=${X11BASE} \
--with-jobs=${MAKE_JOBS} \
--with-cacerts-file=${FILESDIR}/cacerts \
--with-debug-level=release \
@@ -103,8 +101,8 @@ CONFIGURE_ARGS= --disable-option-checkin
--with-zlib=system \
--with-giflib=system \
--with-milestone=fcs \
- --with-update-version=${U} \
- --with-build-number=${B}
+ --with-update-version=${UPDATE_VER} \
+ --with-build-number=${BUILD_VER}
CONFIGURE_ENV+= ac_cv_path_NAWK=awk
MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/common/autoconf/build-aux
@@ -117,28 +115,23 @@ MAKE_ENV+= USE_CLANG=true
.endif
JDKHOME= jdk-1.8.0
-JREHOME= jre-1.8.0
-SUBST_VARS= JDKHOME JREHOME
+SUBST_VARS= JDKHOME
JVMARCH= ${MACHINE_ARCH:S/i386/x86/:S/amd64/x86_64/}
BUILDDIR= ${WRKDIST}/build/bsd-${JVMARCH}-normal-server-release/images
JDKIMAGEDIR= ${BUILDDIR}/j2sdk-image
-JREIMAGEDIR= ${BUILDDIR}/j2re-image
WRKTMP= ${WRKDIR}/tmp
post-extract:
chmod +x ${WRKDIST}/configure
post-build:
- @rm -rf ${JDKIMAGEDIR}/man/ja ${JDKIMAGEDIR}/man/ja_JP.UTF-8 \
- ${JREIMAGEDIR}/man/ja ${JREIMAGEDIR}/man/ja_JP.UTF-8
+ @rm -rf ${JDKIMAGEDIR}/man/ja ${JDKIMAGEDIR}/man/ja_JP.UTF-8
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/${JDKHOME}
cd ${JDKIMAGEDIR} && tar -cf - * | tar -C ${PREFIX}/${JDKHOME} -xf -
- ${INSTALL_DATA_DIR} ${PREFIX}/${JREHOME}
- cd ${JREIMAGEDIR} && tar -cf - * | tar -C ${PREFIX}/${JREHOME} -xf -
# The bootjdk is the jdk image with some parts deleted
# and a copy of the system shared libs needed to run it.
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/jdk/1.8/distinfo,v
retrieving revision 1.15
diff -u -p -u -p -r1.15 distinfo
--- distinfo 11 Mar 2019 19:51:35 -0000 1.15
+++ distinfo 2 Jun 2019 18:23:51 -0000
@@ -1,8 +1,8 @@
SHA256 (jdk/apache-ant-1.9.7-bin.tar.gz) = HQuAj+gszpvMFn+Nu3x+icHX91NMDZxkv2Fex8Pmv+U=
-SHA256 (jdk/openjdk-8u202b08-bsd-port-20190310.tar.xz) = JmdIagNtKtC6/S5Q1LLrK95Nh9CXCBmvsX83oPtRUR0=
+SHA256 (jdk/jdk8u212-b04.1.tar.gz) = tpsmAb0d22hwDfgBsK1cg1HKjJN1cxMGA5EGFOfUeNY=
SHA256 (jdk/openjdk8-bootjdk-amd64-20190111.tar.gz) = 38Gn7muNOI6C3COaFCJb4JMo8qwYUHDS8WczJUZWXUU=
SHA256 (jdk/openjdk8-bootjdk-i386-20190111.tar.gz) = TpxOjy2Ko4hZqA8pckqj2lwqOdFn49uLmlYK5QpORss=
SIZE (jdk/apache-ant-1.9.7-bin.tar.gz) = 5601575
-SIZE (jdk/openjdk-8u202b08-bsd-port-20190310.tar.xz) = 55680852
+SIZE (jdk/jdk8u212-b04.1.tar.gz) = 85191465
SIZE (jdk/openjdk8-bootjdk-amd64-20190111.tar.gz) = 78174211
SIZE (jdk/openjdk8-bootjdk-i386-20190111.tar.gz) = 76219419
Index: patches/patch-hotspot_src_os_bsd_vm_os_bsd_cpp
===================================================================
RCS file: patches/patch-hotspot_src_os_bsd_vm_os_bsd_cpp
diff -N patches/patch-hotspot_src_os_bsd_vm_os_bsd_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-hotspot_src_os_bsd_vm_os_bsd_cpp 2 Jun 2019 18:23:51 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Index: hotspot/src/os/bsd/vm/os_bsd.cpp
+--- hotspot/src/os/bsd/vm/os_bsd.cpp.orig
++++ hotspot/src/os/bsd/vm/os_bsd.cpp
+@@ -2407,8 +2407,10 @@ static char* anon_mmap(char* requested_addr, size_t by
+ if (fixed) {
+ assert((uintptr_t)requested_addr % os::Bsd::page_size() == 0, "unaligned address");
+ flags |= MAP_FIXED;
++#ifndef __OpenBSD__
+ } else if (alignment_hint > 0) {
+ flags |= MAP_ALIGNED(ffs(alignment_hint) - 1);
++
No comments:
Post a Comment