diff options
| author | tnn <tnn@pkgsrc.org> | 2021-06-29 17:32:52 +0000 |
|---|---|---|
| committer | tnn <tnn@pkgsrc.org> | 2021-06-29 17:32:52 +0000 |
| commit | 4c38f688b98b01030076357d922967bb441ecdb7 (patch) | |
| tree | feca0d25fd03d1bdc44073d041cd0ed8da0dd96d /lang/openjdk8 | |
| parent | f4cc0fc0b269da8eea635be53e93f4635a0b72f3 (diff) | |
| download | pkgsrc-4c38f688b98b01030076357d922967bb441ecdb7.tar.gz | |
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 (limited to 'lang/openjdk8')
| -rw-r--r-- | lang/openjdk8/Makefile | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/lang/openjdk8/Makefile b/lang/openjdk8/Makefile index 56d182626c3..443dfcf790a 100644 --- a/lang/openjdk8/Makefile +++ b/lang/openjdk8/Makefile @@ -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_FILES.zlibpath+= jdk/make/lib/Awt2dLibraries.gmk 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 |