Date: Fri, 5 Jan 2024 21:04:47 GMT From: Piotr Kubaj <pkubaj@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 85165d2aeb3d - main - java/openjdk18: drop ELFv1 support Message-ID: <202401052104.405L4lcp012288@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=85165d2aeb3d82141bef5d1bb09dc261e70845bb commit 85165d2aeb3d82141bef5d1bb09dc261e70845bb Author: Piotr Kubaj <pkubaj@FreeBSD.org> AuthorDate: 2024-01-04 23:03:28 +0000 Commit: Piotr Kubaj <pkubaj@FreeBSD.org> CommitDate: 2024-01-05 21:01:09 +0000 java/openjdk18: drop ELFv1 support --- java/openjdk18/Makefile | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/java/openjdk18/Makefile b/java/openjdk18/Makefile index c5fb53256fc3..ce47e54f0dc2 100644 --- a/java/openjdk18/Makefile +++ b/java/openjdk18/Makefile @@ -114,7 +114,7 @@ JDK_BUILD_TYPE= release .include <bsd.port.pre.mk> BOOTSTRAP_JDKS= ${LOCALBASE}/openjdk18 -.if ${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH} == i386 || (defined(PPC_ABI) && ${PPC_ABI} == ELFv2) || ${ARCH} == powerpc64le +.if ${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH} == i386 || ${ARCH:Mpowerpc64*} BOOTSTRAP_JDKS+= ${LOCALBASE}/bootstrap-openjdk17 .endif BOOTSTRAP_JDKS+= ${LOCALBASE}/openjdk17 @@ -128,7 +128,7 @@ BOOTSTRAPJDKDIR= ${BJDK} # if no valid jdk found, set dependency .if !defined(BOOTSTRAPJDKDIR) -. if ${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH} == i386 || (defined(PPC_ABI) && ${PPC_ABI} == ELFv2) || ${ARCH} == powerpc64le +. if ${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH} == i386 || ${ARCH:Mpowerpc64*} BOOTSTRAPJDKDIR?= ${LOCALBASE}/bootstrap-openjdk17 BUILD_DEPENDS+= ${BOOTSTRAPJDKDIR}/bin/javac:java/bootstrap-openjdk17 . else @@ -165,11 +165,8 @@ CONFIGURE_ARGS+= --with-extra-cxxflags="${EXTRA_CFLAGS}" .if ${ARCH} == aarch64 || ${ARCH:Mpowerpc64*} CONFIGURE_ARGS+= --disable-warnings-as-errors .endif -.if ${ARCH} == aarch64 || (defined(PPC_ABI) && ${PPC_ABI} == ELFv1) -CONFIGURE_ARGS+= --disable-dtrace -.endif .if ${ARCH} == aarch64 -CONFIGURE_ARGS+= --with-boot-jdk-jvmargs=-XX:-UseCompressedClassPointers +CONFIGURE_ARGS+= --with-boot-jdk-jvmargs=-XX:-UseCompressedClassPointers --disable-dtrace MAKE_ENV+= JAVA_TOOL_OPTIONS="-XX:-UseCompressedClassPointers" EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src_hotspot_share_runtime_arguments.cpp .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202401052104.405L4lcp012288>