cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix build on aarch64 and an upstream bugfix:

Browse Source 
* Rebuild bootstrap JDKs due to the recent arm64 syscall ABI change.
* Don't throw IOException if the close(2) failure was due to
  ECONNRESET. From upstream repo.
This commit is contained in:
kurt 2020-02-26 02:17:12 +00:00
parent 212a66ca9a
commit 96e2fe3cb2
3 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
devel/jdk/11/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.14 2020/01/18 00:18:36 kurt Exp $
# $OpenBSD: Makefile,v 1.15 2020/02/26 02:17:12 kurt Exp $
ONLY_FOR_ARCHS= i386 amd64 aarch64
USE_WXNEEDED= Yes
@ -12,13 +12,14 @@ VERSION_STR= ${BASE_VER}+${PATCH_VER}-${BSD_PORT_REL}
PACKAGE_VER= ${BASE_VER}.${PATCH_VER}.${BSD_PORT_REL}
PKGNAME= jdk-${PACKAGE_VER}
PKGSTEM= jdk-11
REVISION= 0
EPOCH= 0
DIST_SUBDIR= jdk
DISTNAME= jdk-${VERSION_STR}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
WRKDIST= ${WRKDIR}/openjdk-jdk11u-jdk-${BASE_VER}-${PATCH_VER}-${BSD_PORT_REL}
BOOTJDK_DATE= 20190919
BOOTJDK_DATE= 20200225
CATEGORIES= devel/jdk java

12
devel/jdk/11/distinfo
View File

@ -1,8 +1,8 @@
SHA256 (jdk/jdk-11.0.6+10-1.tar.gz) = BiRQl0t98+xxKLA2G6scRw+bfMRUKncwT0xes7R1Km8=
SHA256 (jdk/openjdk-jdk11u-bootjdk-aarch64-20190919.tar.gz) = Rt/ZLdUf8FZXf2Ss7uw7aDHkrNCW/CN/AOdL0sj/CF8=
SHA256 (jdk/openjdk-jdk11u-bootjdk-amd64-20190919.tar.gz) = sOBqXutJcjIJC2HBAHKl5RwDObxMvaxNO5VtNfReWus=
SHA256 (jdk/openjdk-jdk11u-bootjdk-i386-20190919.tar.gz) = ixD5L58A+3YBMi9Ve+2bWn6CCHmdCGhDzALRCIVCc4U=
SHA256 (jdk/openjdk-jdk11u-bootjdk-aarch64-20200225.tar.gz) = ids081WM5yXCFQ3bu/Sni32Nhs/fe9hBVfTeg14hMxc=
SHA256 (jdk/openjdk-jdk11u-bootjdk-amd64-20200225.tar.gz) = zt2x5jCsxQ0BgqyHtBH5dLBzt5l/5KBAQh9mp1eiVis=
SHA256 (jdk/openjdk-jdk11u-bootjdk-i386-20200225.tar.gz) = jMZ1ZKktR/xvX1oQV8OrPuMYWLoBoAdjEAxfpDS+HWo=
SIZE (jdk/jdk-11.0.6+10-1.tar.gz) = 117035292
SIZE (jdk/openjdk-jdk11u-bootjdk-aarch64-20190919.tar.gz) = 103258821
SIZE (jdk/openjdk-jdk11u-bootjdk-amd64-20190919.tar.gz) = 113594555
SIZE (jdk/openjdk-jdk11u-bootjdk-i386-20190919.tar.gz) = 102061258
SIZE (jdk/openjdk-jdk11u-bootjdk-aarch64-20200225.tar.gz) = 103465813
SIZE (jdk/openjdk-jdk11u-bootjdk-amd64-20200225.tar.gz) = 113727367
SIZE (jdk/openjdk-jdk11u-bootjdk-i386-20200225.tar.gz) = 102190977

18
devel/jdk/11/patches/patch-src_java_base_unix_native_libnio_ch_FileDispatcherImpl_c Normal file
View File

@ -0,0 +1,18 @@
$OpenBSD: patch-src_java_base_unix_native_libnio_ch_FileDispatcherImpl_c,v 1.1 2020/02/26 02:17:12 kurt Exp $
Don't throw IOException if the close(2) failure was due to ECONNRESET
https://github.com/battleblow/openjdk-jdk11u/commit/e0adb3c7fef6777e23c3b746a2a9d3db50bfebb8.patch
Index: src/java.base/unix/native/libnio/ch/FileDispatcherImpl.c
--- src/java.base/unix/native/libnio/ch/FileDispatcherImpl.c.orig
+++ src/java.base/unix/native/libnio/ch/FileDispatcherImpl.c
@@ -291,7 +291,7 @@ Java_sun_nio_ch_FileDispatcherImpl_release0(JNIEnv *en
static void closeFileDescriptor(JNIEnv *env, int fd) {
if (fd != -1) {
int result = close(fd);
- if (result < 0)
+ if (result < 0 && errno != ECONNRESET)
JNU_ThrowIOExceptionWithLastError(env, "Close failed");
}
}