java/openjdk17: Use the bootstrap port on supported ARCHs

This commit is contained in:
Greg Lewis 2021-11-27 08:50:26 -08:00
parent 38dd7c5032
commit 11b6514a01

View file

@ -104,8 +104,11 @@ JDK_BUILD_TYPE= release
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
BOOTSTRAP_JDKS= ${LOCALBASE}/openjdk17 \ BOOTSTRAP_JDKS= ${LOCALBASE}/openjdk17
${LOCALBASE}/openjdk16 .if ${ARCH} == aarch64 || ${ARCH} == amd64
BOOTSTRAP_JDKS+= ${LOCALBASE}/bootstrap-openjdk17
.endif
BOOTSTRAP_JDKS+= ${LOCALBASE}/openjdk16
# do we have valid native jdk installed? # do we have valid native jdk installed?
.for BJDK in ${BOOTSTRAP_JDKS} .for BJDK in ${BOOTSTRAP_JDKS}
@ -116,8 +119,13 @@ BOOTSTRAPJDKDIR= ${BJDK}
# if no valid jdk found, set dependency # if no valid jdk found, set dependency
.if !defined(BOOTSTRAPJDKDIR) .if !defined(BOOTSTRAPJDKDIR)
. if ${ARCH} == aarch64 || ${ARCH} == amd64
BOOTSTRAPJDKDIR?= ${LOCALBASE}/bootstrap-openjdk17
BUILD_DEPENDS+= ${BOOTSTRAPJDKDIR}/bin/javac:java/bootstrap-openjdk17
. else
BOOTSTRAPJDKDIR?= ${LOCALBASE}/openjdk16 BOOTSTRAPJDKDIR?= ${LOCALBASE}/openjdk16
BUILD_DEPENDS+= ${BOOTSTRAPJDKDIR}/bin/javac:java/openjdk16 BUILD_DEPENDS+= ${BOOTSTRAPJDKDIR}/bin/javac:java/openjdk16
. endif
.endif .endif
JDK_BUILD_JVM= server JDK_BUILD_JVM= server