pkgsrc-WIP-changes archive

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

openjdk17: Fix more NetBSD kqueue values



Module Name:	pkgsrc-wip
Committed By:	Ryo ONODERA <ryoon%NetBSD.org@localhost>
Pushed By:	ryoon
Date:		Sun Apr 3 09:28:41 2022 +0900
Changeset:	f533d0333b9490bd1266d003811096f44dba5348

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

Log Message:
openjdk17: Fix more NetBSD kqueue values

* Update bootstyrap kit with new kqueue values.
* Bump PKGREVISION.

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

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

diffstat:
 openjdk17/Makefile     | 5 ++++-
 openjdk17/bootstrap.mk | 2 +-
 openjdk17/distinfo     | 6 +++---
 3 files changed, 8 insertions(+), 5 deletions(-)

diffs:
diff --git a/openjdk17/Makefile b/openjdk17/Makefile
index 5f3c2c3d74..a5d5ea9b91 100644
--- a/openjdk17/Makefile
+++ b/openjdk17/Makefile
@@ -2,6 +2,7 @@
 
 DISTNAME=	jdk17u-${GITHUB_TAG:C/\+/-/}
 PKGNAME=	openjdk17-1.${GITHUB_TAG:C/\+/./:C/jdk-([.0-9]+).*/\1/}
+PKGREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GITHUB:=battleblow/}
 GITHUB_PROJECT=	jdk17u
@@ -132,13 +133,15 @@ SUBST_FILES.fontpaths+=		src/java.desktop/unix/native/common/awt/fontpath.c
 SUBST_VARS.fontpaths=		PREFIX BUILDLINK_PREFIX.fontconfig
 
 .if ${OPSYS} == "NetBSD"
-# NetBSD's EVFILT_* are different from FreeBSD/OpenBSD's values.
+# NetBSD's EVFILT_* EV_* are different from FreeBSD/OpenBSD's values.
 SUBST_CLASSES+=			kqueue
 SUBST_STAGE.kqueue=		pre-configure
 SUBST_MESSAGE.kqueue=		fixing kqueue filter values
 SUBST_FILES.kqueue=		src/java.base/bsd/classes/sun/nio/ch/KQueue.java
 SUBST_SED.kqueue=		-e 's/static final int EVFILT_READ  = -1;/static final int EVFILT_READ  = 0;/'
 SUBST_SED.kqueue+=		-e 's/static final int EVFILT_WRITE = -2;/static final int EVFILT_WRITE = 1;/'
+SUBST_SED.kqueue+=		-e 's/static final int EV_ONESHOT = 0x0010;/static final int EV_ONESHOT = 0x0004;/'
+SUBST_SED.kqueue+=		-e 's/static final int EV_CLEAR   = 0x0020;/static final int EV_CLEAR   = 0x0008;/'
 .endif
 
 PLIST_VARS+=			internal_vm_compiler jvmci
diff --git a/openjdk17/bootstrap.mk b/openjdk17/bootstrap.mk
index 24017203eb..2554d3ee35 100644
--- a/openjdk17/bootstrap.mk
+++ b/openjdk17/bootstrap.mk
@@ -10,7 +10,7 @@
 #.endif
 
 ONLY_FOR_PLATFORM+=		NetBSD-*-x86_64
-BOOT.nb10-amd64=		bootstrap-jdk-1.17.0.2.8-netbsd-10-amd64-20220324.tar.xz
+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)
diff --git a/openjdk17/distinfo b/openjdk17/distinfo
index 07ebeab329..4e83040ed7 100644
--- a/openjdk17/distinfo
+++ b/openjdk17/distinfo
@@ -1,8 +1,8 @@
 $NetBSD: distinfo,v 1.29 2022/03/05 14:47:24 tnn Exp $
 
-BLAKE2s (bootstrap-jdk-1.17.0.2.8-netbsd-10-amd64-20220324.tar.xz) = 18b0af103119a86ba5a2bfb13d13cc3b7bb37c8098904e9775d1de0054e45cf5
-SHA512 (bootstrap-jdk-1.17.0.2.8-netbsd-10-amd64-20220324.tar.xz) = 49aa3c929529b3f3ec43c54f359bf15275013069cdde98b6d088f12a2fc3b18e113c7e3b9a7c4cba963322f2e9eb96d2d4359c324e2c4ac399bc2db3e3fcac2f
-Size (bootstrap-jdk-1.17.0.2.8-netbsd-10-amd64-20220324.tar.xz) = 320276156 bytes
+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 (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