pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/lang/openjdk8 openjdk8: backport kqueue fix from openj...
details: https://anonhg.NetBSD.org/pkgsrc/rev/995df4bc9467
branches: trunk
changeset: 455205:995df4bc9467
user: tnn <tnn%pkgsrc.org@localhost>
date: Tue Jun 29 17:32:52 2021 +0000
description:
openjdk8: backport kqueue fix from openjdk11
Although 8 doesn't seem to use kqueue by default the class is
still compiled so it's a good idea to have the correct values.
Bump PKGREVISION for this and recent changes.
diffstat:
lang/openjdk8/Makefile | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diffs (30 lines):
diff -r f27a5b5c3331 -r 995df4bc9467 lang/openjdk8/Makefile
--- a/lang/openjdk8/Makefile Tue Jun 29 15:15:28 2021 +0000
+++ b/lang/openjdk8/Makefile Tue Jun 29 17:32:52 2021 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.107 2021/06/27 14:54:40 tnn Exp $
+# $NetBSD: Makefile,v 1.108 2021/06/29 17:32:52 tnn Exp $
DISTNAME= openjdk-jdk8u-${GITHUB_TAG}
PKGNAME= openjdk8-1.8.${GITHUB_TAG:C/.*u([0-9]+).*/\1/}
+PKGREVISION= 1
CATEGORIES= lang
MASTER_SITES= ${MASTER_SITE_GITHUB:=battleblow/}
MASTER_SITES+= ${MASTER_SITE_LOCAL:=openjdk7/} # for bootstrap kits
@@ -161,6 +162,16 @@
SUBST_VARS.zlibpath= COMPILER_RPATH_FLAG BUILDLINK_PREFIX.zlib
SUBST_VARS.zlibpath+= BUILDLINK_PREFIX.iconv
+.if ${OPSYS} == "NetBSD"
+# NetBSD's EVFILT_* 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= jdk/src/solaris/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;/'
+.endif
+
PLIST_VARS+= i386
.if ${MACHINE_ARCH} == "i386"
PLIST.i386= yes
Home |
Main Index |
Thread Index |
Old Index