git: 7179e6d9b09d - main - java/bootstrap-openjdk17: add powerpc bootstrap

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Piotr Kubaj <pkubaj_at_FreeBSD.org>
Date: Fri, 17 Jan 2025 21:47:41 UTC
The branch main has been updated by pkubaj:

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

commit 7179e6d9b09de8aea14b1ee97eb422bf5b002bc5
Author:     Piotr Kubaj <pkubaj@FreeBSD.org>
AuthorDate: 2025-01-17 17:13:03 +0000
Commit:     Piotr Kubaj <pkubaj@FreeBSD.org>
CommitDate: 2025-01-17 21:46:12 +0000

    java/bootstrap-openjdk17: add powerpc bootstrap
    
    While here, also rename powerpc64 to remove the unnecessary elfv2 string.
---
 java/bootstrap-openjdk17/Makefile  | 11 +++++++---
 java/bootstrap-openjdk17/distinfo  |  6 ++++--
 java/bootstrap-openjdk17/pkg-plist | 42 +++++++++++++++++++-------------------
 3 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/java/bootstrap-openjdk17/Makefile b/java/bootstrap-openjdk17/Makefile
index f58f0e127884..2398999699b6 100644
--- a/java/bootstrap-openjdk17/Makefile
+++ b/java/bootstrap-openjdk17/Makefile
@@ -12,7 +12,7 @@ WWW=		https://openjdk.java.net/
 
 LICENSE=	GPLv2
 
-ONLY_FOR_ARCHS=	aarch64 amd64 i386 powerpc64 powerpc64le
+ONLY_FOR_ARCHS=	aarch64 amd64 i386 powerpc powerpc64 powerpc64le
 
 USES=		tar:xz
 
@@ -22,13 +22,18 @@ WRKSRC=		${WRKDIR}/${JDK_ROOT}
 
 JDK_PORT=	${PKGNAMEPREFIX}${PORTNAME}
 JDK_ROOT=	${PKGNAMEPREFIX}${PORTNAME}
-JDK_ARCH=	${ARCH:C/armv.*/arm/}${JDK_ARCH_SUFFIX_${ARCH}}
-JDK_ARCH_SUFFIX_powerpc64=	-elfv2
+JDK_ARCH=	${ARCH:C/armv.*/arm/}
 
 INSTALLDIR=	${STAGEDIR}${PREFIX}/${JDK_ROOT}
 
 .include <bsd.port.options.mk>
 
+.if ${ARCH} == powerpc
+PLIST_SUB+=	NOT_PPC="@comment "
+.else
+PLIST_SUB+=	NOT_PPC=""
+.endif
+
 .if ${ARCH:Mpowerpc64*}
 PLIST_SUB+=	NOT_PPC64="@comment "
 .else
diff --git a/java/bootstrap-openjdk17/distinfo b/java/bootstrap-openjdk17/distinfo
index 8a7464323e7c..41e811b9bdef 100644
--- a/java/bootstrap-openjdk17/distinfo
+++ b/java/bootstrap-openjdk17/distinfo
@@ -5,7 +5,9 @@ SHA256 (bootstrap-openjdk17-amd64-17.0.1.12.1.tar.xz) = 1c8469678ab77e61d78f05ff
 SIZE (bootstrap-openjdk17-amd64-17.0.1.12.1.tar.xz) = 109958368
 SHA256 (bootstrap-openjdk17-i386-17.0.1.12.1.tar.xz) = dd9843939bcccb5772f4485a4553264e81dfb39a42f794de50200bd352f773c3
 SIZE (bootstrap-openjdk17-i386-17.0.1.12.1.tar.xz) = 104910036
-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
+SHA256 (bootstrap-openjdk17-powerpc64-17.0.1.12.1.tar.xz) = 083e22f78add71a6f6c96a8aa87aa147e790f56a39beba8b33f70166256e920f
+SIZE (bootstrap-openjdk17-powerpc64-17.0.1.12.1.tar.xz) = 104895520
 SHA256 (bootstrap-openjdk17-powerpc64le-17.0.1.12.1.tar.xz) = f9677056f6b2fc2c0f1a33a1b75b4cbc592eb8d3b39ab9fed4b22e5f7b468e1f
 SIZE (bootstrap-openjdk17-powerpc64le-17.0.1.12.1.tar.xz) = 105348816
+SHA256 (bootstrap-openjdk17-powerpc-17.0.1.12.1.tar.xz) = c76cbef0c1a8acff59c37e0e36acaec38862dc8a4e8c54eba74f6341b325ad13
+SIZE (bootstrap-openjdk17-powerpc-17.0.1.12.1.tar.xz) = 95787772
diff --git a/java/bootstrap-openjdk17/pkg-plist b/java/bootstrap-openjdk17/pkg-plist
index 1bc00082b797..683de5c50927 100644
--- a/java/bootstrap-openjdk17/pkg-plist
+++ b/java/bootstrap-openjdk17/pkg-plist
@@ -37,18 +37,18 @@
 %%JDK_ROOT%%/lib/liblcms.so
 %%JDK_ROOT%%/lib/libprefs.so
 %%JDK_ROOT%%/lib/librmi.so
-%%JDK_ROOT%%/lib/libsaproc.so
+%%NOT_PPC%%%%JDK_ROOT%%/lib/libsaproc.so
 %%JDK_ROOT%%/lib/libsctp.so
 %%JDK_ROOT%%/lib/libsplashscreen.so
 %%JDK_ROOT%%/lib/libsyslookup.so
 %%JDK_ROOT%%/lib/libverify.so
 %%JDK_ROOT%%/lib/libzip.so
 %%JDK_ROOT%%/lib/modules
-%%JDK_ROOT%%/lib/classlist
-%%NOT_I386%%%%JDK_ROOT%%/lib/server/classes_nocoops.jsa
+%%NOT_PPC%%%%JDK_ROOT%%/lib/classlist
+%%NOT_PPC%%%%NOT_I386%%%%JDK_ROOT%%/lib/server/classes_nocoops.jsa
 %%JDK_ROOT%%/lib/server/libjsig.so
 %%JDK_ROOT%%/lib/server/libjvm.so
-%%JDK_ROOT%%/lib/server/classes.jsa
+%%NOT_PPC%%%%JDK_ROOT%%/lib/server/classes.jsa
 %%JDK_ROOT%%/lib/security/cacerts
 %%JDK_ROOT%%/lib/security/default.policy
 %%JDK_ROOT%%/lib/security/public_suffix_list.dat
@@ -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
-%%NOT_I386%%%%NOT_PPC64%%%%JDK_ROOT%%/legal/jdk.internal.vm.compiler/ASSEMBLY_EXCEPTION
-%%NOT_I386%%%%NOT_PPC64%%%%JDK_ROOT%%/legal/jdk.internal.vm.compiler/LICENSE
-%%NOT_I386%%%%NOT_PPC64%%%%JDK_ROOT%%/legal/jdk.internal.vm.compiler/ADDITIONAL_LICENSE_INFO
-%%NOT_I386%%%%NOT_PPC64%%%%JDK_ROOT%%/legal/jdk.internal.vm.compiler.management/ASSEMBLY_EXCEPTION
-%%NOT_I386%%%%NOT_PPC64%%%%JDK_ROOT%%/legal/jdk.internal.vm.compiler.management/LICENSE
-%%NOT_I386%%%%NOT_PPC64%%%%JDK_ROOT%%/legal/jdk.internal.vm.compiler.management/ADDITIONAL_LICENSE_INFO
+%%NOT_PPC%%%%NOT_I386%%%%NOT_PPC64%%%%JDK_ROOT%%/legal/jdk.internal.vm.compiler/ASSEMBLY_EXCEPTION
+%%NOT_PPC%%%%NOT_I386%%%%NOT_PPC64%%%%JDK_ROOT%%/legal/jdk.internal.vm.compiler/LICENSE
+%%NOT_PPC%%%%NOT_I386%%%%NOT_PPC64%%%%JDK_ROOT%%/legal/jdk.internal.vm.compiler/ADDITIONAL_LICENSE_INFO
+%%NOT_PPC%%%%NOT_I386%%%%NOT_PPC64%%%%JDK_ROOT%%/legal/jdk.internal.vm.compiler.management/ASSEMBLY_EXCEPTION
+%%NOT_PPC%%%%NOT_I386%%%%NOT_PPC64%%%%JDK_ROOT%%/legal/jdk.internal.vm.compiler.management/LICENSE
+%%NOT_PPC%%%%NOT_I386%%%%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
-%%NOT_I386%%%%NOT_PPC64%%%%JDK_ROOT%%/legal/jdk.internal.vm.ci/ASSEMBLY_EXCEPTION
-%%NOT_I386%%%%NOT_PPC64%%%%JDK_ROOT%%/legal/jdk.internal.vm.ci/LICENSE
-%%NOT_I386%%%%NOT_PPC64%%%%JDK_ROOT%%/legal/jdk.internal.vm.ci/ADDITIONAL_LICENSE_INFO
+%%NOT_PPC%%%%NOT_I386%%%%NOT_PPC64%%%%JDK_ROOT%%/legal/jdk.internal.vm.ci/ASSEMBLY_EXCEPTION
+%%NOT_PPC%%%%NOT_I386%%%%NOT_PPC64%%%%JDK_ROOT%%/legal/jdk.internal.vm.ci/LICENSE
+%%NOT_PPC%%%%NOT_I386%%%%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
@@ -175,9 +175,9 @@
 %%JDK_ROOT%%/legal/jdk.httpserver/ASSEMBLY_EXCEPTION
 %%JDK_ROOT%%/legal/jdk.httpserver/LICENSE
 %%JDK_ROOT%%/legal/jdk.httpserver/ADDITIONAL_LICENSE_INFO
-%%JDK_ROOT%%/legal/jdk.hotspot.agent/ASSEMBLY_EXCEPTION
-%%JDK_ROOT%%/legal/jdk.hotspot.agent/LICENSE
-%%JDK_ROOT%%/legal/jdk.hotspot.agent/ADDITIONAL_LICENSE_INFO
+%%NOT_PPC%%%%JDK_ROOT%%/legal/jdk.hotspot.agent/ASSEMBLY_EXCEPTION
+%%NOT_PPC%%%%JDK_ROOT%%/legal/jdk.hotspot.agent/LICENSE
+%%NOT_PPC%%%%JDK_ROOT%%/legal/jdk.hotspot.agent/ADDITIONAL_LICENSE_INFO
 %%JDK_ROOT%%/legal/jdk.editpad/ASSEMBLY_EXCEPTION
 %%JDK_ROOT%%/legal/jdk.editpad/LICENSE
 %%JDK_ROOT%%/legal/jdk.editpad/ADDITIONAL_LICENSE_INFO
@@ -319,7 +319,7 @@
 %%JDK_ROOT%%/jmods/java.xml.jmod
 %%JDK_ROOT%%/jmods/jdk.accessibility.jmod
 %%JDK_ROOT%%/jmods/jdk.attach.jmod
-%%JDK_ROOT%%/jmods/jdk.hotspot.agent.jmod
+%%NOT_PPC%%%%JDK_ROOT%%/jmods/jdk.hotspot.agent.jmod
 %%JDK_ROOT%%/jmods/jdk.httpserver.jmod
 %%JDK_ROOT%%/jmods/jdk.incubator.foreign.jmod
 %%JDK_ROOT%%/jmods/jdk.incubator.vector.jmod
@@ -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
-%%NOT_I386%%%%NOT_PPC64%%%%JDK_ROOT%%/jmods/jdk.internal.vm.ci.jmod
+%%NOT_PPC%%%%NOT_I386%%%%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
-%%NOT_I386%%%%NOT_PPC64%%%%JDK_ROOT%%/jmods/jdk.internal.vm.compiler.jmod
-%%NOT_I386%%%%NOT_PPC64%%%%JDK_ROOT%%/jmods/jdk.internal.vm.compiler.management.jmod
+%%NOT_PPC%%%%NOT_I386%%%%NOT_PPC64%%%%JDK_ROOT%%/jmods/jdk.internal.vm.compiler.jmod
+%%NOT_PPC%%%%NOT_I386%%%%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
@@ -390,7 +390,7 @@
 %%JDK_ROOT%%/bin/jdeprscan
 %%JDK_ROOT%%/bin/jdeps
 %%JDK_ROOT%%/bin/jfr
-%%JDK_ROOT%%/bin/jhsdb
+%%NOT_PPC%%%%JDK_ROOT%%/bin/jhsdb
 %%JDK_ROOT%%/bin/jimage
 %%JDK_ROOT%%/bin/jinfo
 %%JDK_ROOT%%/bin/jlink