Changeset View
Changeset View
Standalone View
Standalone View
java/openjdk17/Makefile
Show First 20 Lines • Show All 105 Lines • ▼ Show 20 Lines | |||||
.if defined(BUILD_JRE) | .if defined(BUILD_JRE) | ||||
ALL_TARGET= legacy-images | ALL_TARGET= legacy-images | ||||
.else | .else | ||||
ALL_TARGET= images | ALL_TARGET= images | ||||
.endif | .endif | ||||
JDK_BUILD_TYPE= release | JDK_BUILD_TYPE= release | ||||
.include <bsd.port.pre.mk> | .include <bsd.port.pre.mk> | ||||
BOOTSTRAP_JDKS= ${LOCALBASE}/openjdk17 | BOOTSTRAP_JDKS= ${LOCALBASE}/openjdk17 ${LOCALBASE}/bootstrap-openjdk17 | ||||
glewis: This conditional seems like it should just be deleted given that openjdk16 is being removed and… | |||||
.if ${ARCH} == aarch64 || ${ARCH} == amd64 || (defined(PPC_ABI) && ${PPC_ABI} == ELFv2) || ${ARCH} == powerpc64le | |||||
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} | ||||
. if !defined(BOOTSTRAPJDKDIR) && exists(${BJDK}/bin/javac) | . if !defined(BOOTSTRAPJDKDIR) && exists(${BJDK}/bin/javac) | ||||
BOOTSTRAPJDKDIR= ${BJDK} | BOOTSTRAPJDKDIR= ${BJDK} | ||||
. endif | . endif | ||||
.endfor | .endfor | ||||
# 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 || (defined(PPC_ABI) && ${PPC_ABI} == ELFv2) || ${ARCH} == powerpc64le | |||||
BOOTSTRAPJDKDIR?= ${LOCALBASE}/bootstrap-openjdk17 | BOOTSTRAPJDKDIR?= ${LOCALBASE}/bootstrap-openjdk17 | ||||
BUILD_DEPENDS+= ${BOOTSTRAPJDKDIR}/bin/javac:java/bootstrap-openjdk17 | BUILD_DEPENDS+= ${BOOTSTRAPJDKDIR}/bin/javac:java/bootstrap-openjdk17 | ||||
. else | |||||
BOOTSTRAPJDKDIR?= ${LOCALBASE}/openjdk16 | |||||
BUILD_DEPENDS+= ${BOOTSTRAPJDKDIR}/bin/javac:java/openjdk16 | |||||
. endif | |||||
.endif | .endif | ||||
Done Inline ActionsCan we just delete this inner conditional now? It seems like it is pretty much covered by ONLY_FOR_ARCHS glewis: Can we just delete this inner conditional now? It seems like it is pretty much covered by… | |||||
Done Inline ActionsSure, I wasn't sure if there was some edge case left. rene: Sure, I wasn't sure if there was some edge case left. | |||||
JDK_BUILD_JVM= server | JDK_BUILD_JVM= server | ||||
MAKE_ENV+= --with-toolchain-type=${COMPILER_TYPE} | MAKE_ENV+= --with-toolchain-type=${COMPILER_TYPE} | ||||
CONFIGURE_ARGS+= --with-toolchain-type=${COMPILER_TYPE} | CONFIGURE_ARGS+= --with-toolchain-type=${COMPILER_TYPE} | ||||
.if ${COMPILER_TYPE} == gcc | .if ${COMPILER_TYPE} == gcc | ||||
USE_GCC= yes | USE_GCC= yes | ||||
▲ Show 20 Lines • Show All 55 Lines • Show Last 20 Lines |
This conditional seems like it should just be deleted given that openjdk16 is being removed and be collapsed into the line above:
BOOTSTRAP_JDKS= ${LOCALBASE}/openjdk17 ${LOCALBASE}/bootstrap-openjdk17