pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

openjdk17: Add bootstrap kit for NetBSD/amd64 9



Module Name:	pkgsrc-wip
Committed By:	Ryo ONODERA <ryoon%NetBSD.org@localhost>
Pushed By:	ryoon
Date:		Sat Apr 9 02:27:53 2022 +0900
Changeset:	b611e96e55de3393226d5b3d79b46dfdc61a299d

Modified Files:
	openjdk17/Makefile
	openjdk17/bootstrap.mk
	openjdk17/distinfo

Log Message:
openjdk17: Add bootstrap kit for NetBSD/amd64 9

And it seems that NetBSD 9 does not support ELF GNU Hash.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=b611e96e55de3393226d5b3d79b46dfdc61a299d

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 openjdk17/Makefile     |  9 +++++++--
 openjdk17/bootstrap.mk | 13 +++++++++++--
 openjdk17/distinfo     |  3 +++
 3 files changed, 21 insertions(+), 4 deletions(-)

diffs:
diff --git a/openjdk17/Makefile b/openjdk17/Makefile
index a5d5ea9b91..f2911c9800 100644
--- a/openjdk17/Makefile
+++ b/openjdk17/Makefile
@@ -32,6 +32,13 @@ BUILDLINK_TRANSFORM+=		opt:-std=c++11:-std=gnu++11
 # For NetBSD
 BUILDLINK_TRANSFORM.NetBSD+=	rm:-ldl
 
+.include "../../mk/bsd.prefs.mk"
+
+# -Wl,--hash-style=gnu is not supported by NetBSD 9.
+.if !empty(MACHINE_PLATFORM:MNetBSD-[1-9].[0-8]*.*-*)
+BUILDLINK_TRANSFORM+=	opt:-Wl,--hash-style=gnu:-Wl,--hash-style=sysv
+.endif
+
 GNU_CONFIGURE=		yes
 GNU_CONFIGURE_STRICT=	no # generates the configure script during the build
 USE_GNU_CONFIGURE_HOST=	no
@@ -76,8 +83,6 @@ CONFIGURE_ARGS+=	--with-default-make-target=product-images
 # It is intentional to use CONFIGURE_ARGS instead of CONFIGURE_ENV here.
 CONFIGURE_ARGS+=	USER=pkgsrc
 
-.include "../../mk/bsd.prefs.mk"
-
 # Avoid build errors when JAVA_HOME and CLASSPATH are defined by user.
 MAKE_ENV+=	JAVA_HOME=
 MAKE_ENV+=	CLASSPATH=
diff --git a/openjdk17/bootstrap.mk b/openjdk17/bootstrap.mk
index 2554d3ee35..2824fc0ad5 100644
--- a/openjdk17/bootstrap.mk
+++ b/openjdk17/bootstrap.mk
@@ -9,11 +9,20 @@
 #EXTRACT_ONLY+=			${BOOT.nb7-i386}
 #.endif
 
-ONLY_FOR_PLATFORM+=		NetBSD-*-x86_64
+ONLY_FOR_PLATFORM+=		NetBSD-9.[0-8]*-x86_64
+BOOT.nb9-amd64=			bootstrap-jdk-1.17.0.2.8-netbsd-9-amd64-20220408.tar.xz
+#SITES.${BOOT.nb9-amd64}=	${MASTER_SITE_LOCAL:=openjdk17/}
+SITES.${BOOT.nb9-amd64}=	https://www.ryoon.net/~ryoon/
+.if !empty(MACHINE_PLATFORM:MNetBSD-9.[0-8]*-x86_64) || make(distinfo)
+DISTFILES+=			${BOOT.nb9-amd64}
+EXTRACT_ONLY+=			${BOOT.nb9-amd64}
+.endif
+
+ONLY_FOR_PLATFORM+=		NetBSD-9.9*-x86_64
 BOOT.nb10-amd64=		bootstrap-jdk-1.17.0.2.8-netbsd-10-amd64-20220401.tar.xz
 #SITES.${BOOT.nb10-amd64}=	${MASTER_SITE_LOCAL:=openjdk17/}
 SITES.${BOOT.nb10-amd64}=	https://www.ryoon.net/~ryoon/
-.if !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) || make(distinfo)
+.if !empty(MACHINE_PLATFORM:MNetBSD-9.9*-x86_64) || make(distinfo)
 DISTFILES+=			${BOOT.nb10-amd64}
 EXTRACT_ONLY+=			${BOOT.nb10-amd64}
 .endif
diff --git a/openjdk17/distinfo b/openjdk17/distinfo
index 4e83040ed7..321a41f375 100644
--- a/openjdk17/distinfo
+++ b/openjdk17/distinfo
@@ -3,6 +3,9 @@ $NetBSD: distinfo,v 1.29 2022/03/05 14:47:24 tnn Exp $
 BLAKE2s (bootstrap-jdk-1.17.0.2.8-netbsd-10-amd64-20220401.tar.xz) = afd8e5dcbfa3d8fe397e97f713d24a1437936dcffbe79f3f0c3e9bfb58bce36d
 SHA512 (bootstrap-jdk-1.17.0.2.8-netbsd-10-amd64-20220401.tar.xz) = f9ddd27ac0ccf77eb72e2c1fe5a06c6431a74b4feeea495233cba058dd8346f215861c59b5228e33729dccdc7f557a29e881123d8592f0cc304536fd5cc3609a
 Size (bootstrap-jdk-1.17.0.2.8-netbsd-10-amd64-20220401.tar.xz) = 320259572 bytes
+BLAKE2s (bootstrap-jdk-1.17.0.2.8-netbsd-9-amd64-20220408.tar.xz) = 8a805fb72760eed42d76b12e6fd655e5af73d6825eb7aeb3acd2201d21f43575
+SHA512 (bootstrap-jdk-1.17.0.2.8-netbsd-9-amd64-20220408.tar.xz) = 8878e31782352316a2777aeb7262c6e01e994b9ec5d73b9d155bfa015dfc14b15e9cbace127e361778e3aec09b4995a35b9df448a94bf50eb2860469396b7b9e
+Size (bootstrap-jdk-1.17.0.2.8-netbsd-9-amd64-20220408.tar.xz) = 288701712 bytes
 BLAKE2s (jdk17u-jdk-17.0.2-8-1.tar.gz) = c642373e109255df6b29c91476c9afe3a0d23b88ec8ad559c432e21b1b51fdd3
 SHA512 (jdk17u-jdk-17.0.2-8-1.tar.gz) = a8127c6bd55ae5fff69209c7ed84803d411cd1660f3e48e95d8fd8fee73c54dbaaa8b5c31de51687a2f194c0c063f7e56b2426866dc926a0e02fd728ceea65b4
 Size (jdk17u-jdk-17.0.2-8-1.tar.gz) = 104857682 bytes


Home | Main Index | Thread Index | Old Index