git: fe26440b8f99 - main - java/bootstrap-openjdk17: add powerpc64 bootstrap

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Piotr Kubaj <pkubaj_at_FreeBSD.org>
Date: Mon, 20 Dec 2021 02:03:35 UTC
The branch main has been updated by pkubaj:

URL: https://cgit.FreeBSD.org/ports/commit/?id=fe26440b8f99a8dc5c235363c82dacebbf70d845

commit fe26440b8f99a8dc5c235363c82dacebbf70d845
Author:     Piotr Kubaj <pkubaj@FreeBSD.org>
AuthorDate: 2021-12-20 01:56:40 +0000
Commit:     Piotr Kubaj <pkubaj@FreeBSD.org>
CommitDate: 2021-12-20 01:56:40 +0000

    java/bootstrap-openjdk17: add powerpc64 bootstrap
    
    Since some files are not present after building openjdk17, they need to be excluded.
---
 java/bootstrap-openjdk17/Makefile  | 13 +++++++++++--
 java/bootstrap-openjdk17/distinfo  |  4 +++-
 java/bootstrap-openjdk17/pkg-plist | 24 ++++++++++++------------
 3 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/java/bootstrap-openjdk17/Makefile b/java/bootstrap-openjdk17/Makefile
index 2ee85b502882..4cf0d762af15 100644
--- a/java/bootstrap-openjdk17/Makefile
+++ b/java/bootstrap-openjdk17/Makefile
@@ -1,7 +1,8 @@
 PORTNAME=	openjdk17
 PORTVERSION=	17.0.1.12.1
 CATEGORIES=	java devel
-MASTER_SITES=	LOCAL/glewis/bootstrap-openjdk17
+MASTER_SITES=	LOCAL/glewis/bootstrap-openjdk17 \
+		LOCAL/pkubaj/bootstrap-openjdk17
 PKGNAMEPREFIX=	bootstrap-
 DISTNAME=	${JDK_PORT}-${JDK_ARCH}-${PORTVERSION}
 
@@ -10,7 +11,7 @@ COMMENT=	Java Development Kit 17
 
 LICENSE=	GPLv2
 
-ONLY_FOR_ARCHS=	aarch64 amd64
+ONLY_FOR_ARCHS=	aarch64 amd64 powerpc64
 
 USES=		tar:xz
 
@@ -25,6 +26,14 @@ JDK_ARCH_SUFFIX_powerpc64=	-${PPC_ABI:tl}
 
 INSTALLDIR=	${STAGEDIR}${PREFIX}/${JDK_ROOT}
 
+.include <bsd.port.options.mk>
+
+.if ${ARCH} == powerpc64
+PLIST_SUB+=	NOT_PPC64="@comment "
+.else
+PLIST_SUB+=	NOT_PPC64=""
+.endif
+
 do-install:
 	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${INSTALLDIR}
 	@cd ${WRKSRC} && ${COPYTREE_BIN} bin ${INSTALLDIR}
diff --git a/java/bootstrap-openjdk17/distinfo b/java/bootstrap-openjdk17/distinfo
index 148f7f54d7fa..5d2d60a780f7 100644
--- a/java/bootstrap-openjdk17/distinfo
+++ b/java/bootstrap-openjdk17/distinfo
@@ -1,5 +1,7 @@
-TIMESTAMP = 1637955076
+TIMESTAMP = 1639868107
 SHA256 (bootstrap-openjdk17-aarch64-17.0.1.12.1.tar.xz) = a1bf65078fbd9bc0826df4e3979ebd4d882b52fc04303b460a9d0d090f68e7a3
 SIZE (bootstrap-openjdk17-aarch64-17.0.1.12.1.tar.xz) = 108306712
 SHA256 (bootstrap-openjdk17-amd64-17.0.1.12.1.tar.xz) = 1c8469678ab77e61d78f05ff1e317a46a3208af086eb6dff822d487513adcaea
 SIZE (bootstrap-openjdk17-amd64-17.0.1.12.1.tar.xz) = 109958368
+SHA256 (bootstrap-openjdk17-powerpc64-elfv2-17.0.1.12.1.tar.xz) = 083e22f78add71a6f6c96a8aa87aa147e790f56a39beba8b33f70166256e920f
+SIZE (bootstrap-openjdk17-powerpc64-elfv2-17.0.1.12.1.tar.xz) = 104895520
diff --git a/java/bootstrap-openjdk17/pkg-plist b/java/bootstrap-openjdk17/pkg-plist
index 1f3998c6b5f2..81e17de84512 100644
--- a/java/bootstrap-openjdk17/pkg-plist
+++ b/java/bootstrap-openjdk17/pkg-plist
@@ -140,18 +140,18 @@
 %%JDK_ROOT%%/legal/jdk.javadoc/jquery.md
 %%JDK_ROOT%%/legal/jdk.javadoc/jqueryUI.md
 %%JDK_ROOT%%/legal/jdk.javadoc/ADDITIONAL_LICENSE_INFO
-%%JDK_ROOT%%/legal/jdk.internal.vm.compiler/ASSEMBLY_EXCEPTION
-%%JDK_ROOT%%/legal/jdk.internal.vm.compiler/LICENSE
-%%JDK_ROOT%%/legal/jdk.internal.vm.compiler/ADDITIONAL_LICENSE_INFO
-%%JDK_ROOT%%/legal/jdk.internal.vm.compiler.management/ASSEMBLY_EXCEPTION
-%%JDK_ROOT%%/legal/jdk.internal.vm.compiler.management/LICENSE
-%%JDK_ROOT%%/legal/jdk.internal.vm.compiler.management/ADDITIONAL_LICENSE_INFO
+%%NOT_PPC64%%%%JDK_ROOT%%/legal/jdk.internal.vm.compiler/ASSEMBLY_EXCEPTION
+%%NOT_PPC64%%%%JDK_ROOT%%/legal/jdk.internal.vm.compiler/LICENSE
+%%NOT_PPC64%%%%JDK_ROOT%%/legal/jdk.internal.vm.compiler/ADDITIONAL_LICENSE_INFO
+%%NOT_PPC64%%%%JDK_ROOT%%/legal/jdk.internal.vm.compiler.management/ASSEMBLY_EXCEPTION
+%%NOT_PPC64%%%%JDK_ROOT%%/legal/jdk.internal.vm.compiler.management/LICENSE
+%%NOT_PPC64%%%%JDK_ROOT%%/legal/jdk.internal.vm.compiler.management/ADDITIONAL_LICENSE_INFO
 %%JDK_ROOT%%/legal/jdk.jartool/ASSEMBLY_EXCEPTION
 %%JDK_ROOT%%/legal/jdk.jartool/LICENSE
 %%JDK_ROOT%%/legal/jdk.jartool/ADDITIONAL_LICENSE_INFO
-%%JDK_ROOT%%/legal/jdk.internal.vm.ci/ASSEMBLY_EXCEPTION
-%%JDK_ROOT%%/legal/jdk.internal.vm.ci/LICENSE
-%%JDK_ROOT%%/legal/jdk.internal.vm.ci/ADDITIONAL_LICENSE_INFO
+%%NOT_PPC64%%%%JDK_ROOT%%/legal/jdk.internal.vm.ci/ASSEMBLY_EXCEPTION
+%%NOT_PPC64%%%%JDK_ROOT%%/legal/jdk.internal.vm.ci/LICENSE
+%%NOT_PPC64%%%%JDK_ROOT%%/legal/jdk.internal.vm.ci/ADDITIONAL_LICENSE_INFO
 %%JDK_ROOT%%/legal/jdk.internal.opt/ASSEMBLY_EXCEPTION
 %%JDK_ROOT%%/legal/jdk.internal.opt/LICENSE
 %%JDK_ROOT%%/legal/jdk.internal.opt/jopt-simple.md
@@ -327,7 +327,7 @@
 %%JDK_ROOT%%/jmods/jdk.internal.jvmstat.jmod
 %%JDK_ROOT%%/jmods/jdk.internal.le.jmod
 %%JDK_ROOT%%/jmods/jdk.internal.opt.jmod
-%%JDK_ROOT%%/jmods/jdk.internal.vm.ci.jmod
+%%NOT_PPC64%%%%JDK_ROOT%%/jmods/jdk.internal.vm.ci.jmod
 %%JDK_ROOT%%/jmods/jdk.jdi.jmod
 %%JDK_ROOT%%/jmods/jdk.jdwp.agent.jmod
 %%JDK_ROOT%%/jmods/jdk.management.agent.jmod
@@ -335,8 +335,8 @@
 %%JDK_ROOT%%/jmods/jdk.management.jmod
 %%JDK_ROOT%%/jmods/jdk.naming.dns.jmod
 %%JDK_ROOT%%/jmods/java.compiler.jmod
-%%JDK_ROOT%%/jmods/jdk.internal.vm.compiler.jmod
-%%JDK_ROOT%%/jmods/jdk.internal.vm.compiler.management.jmod
+%%NOT_PPC64%%%%JDK_ROOT%%/jmods/jdk.internal.vm.compiler.jmod
+%%NOT_PPC64%%%%JDK_ROOT%%/jmods/jdk.internal.vm.compiler.management.jmod
 %%JDK_ROOT%%/jmods/jdk.jartool.jmod
 %%JDK_ROOT%%/jmods/jdk.javadoc.jmod
 %%JDK_ROOT%%/jmods/jdk.jcmd.jmod