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

Fix file interaction: load libnio in BsdNativeDispatcher and export

Browse Source 
getmntonname0 from libnio.  Fixes scala -howtorun:script breakage
reported by solene.

Patch from https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=241317

ok kurt
This commit is contained in:
tb 2019-11-21 17:39:08 +00:00
parent e91e7327b0
commit be0bab9112
3 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
devel/jdk/1.8/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.47 2019/10/26 17:03:11 kurt Exp $
# $OpenBSD: Makefile,v 1.48 2019/11/21 17:39:08 tb Exp $
ONLY_FOR_ARCHS= i386 amd64
USE_WXNEEDED= Yes
@ -13,6 +13,7 @@ V= ${BASE_VER}.${UPDATE_VER}.${BUILD_VER}.${BSD_PORT_REL}
PKGNAME= jdk-${V}
PKGSTEM= jdk-${BASE_VER}
EPOCH= 0
REVISION= 0
DIST_SUBDIR= jdk
DISTNAME= jdk8u${UPDATE_VER}-${BUILD_VER}.${BSD_PORT_REL}

15
devel/jdk/1.8/patches/patch-jdk_make_mapfiles_libnio_mapfile-bsd Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-jdk_make_mapfiles_libnio_mapfile-bsd,v 1.1 2019/11/21 17:39:08 tb Exp $
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=241317
Index: jdk/make/mapfiles/libnio/mapfile-bsd
--- jdk/make/mapfiles/libnio/mapfile-bsd.orig
+++ jdk/make/mapfiles/libnio/mapfile-bsd
@@ -135,6 +135,7 @@ SUNWprivate_1.1 {
Java_sun_nio_fs_BsdNativeDispatcher_endfsstat;
Java_sun_nio_fs_BsdNativeDispatcher_fsstatEntry;
Java_sun_nio_fs_BsdNativeDispatcher_getfsstat;
+ Java_sun_nio_fs_BsdNativeDispatcher_getmntonname0;
Java_sun_nio_fs_BsdNativeDispatcher_initIDs;
Java_sun_nio_fs_GnomeFileTypeDetector_initializeGio;
Java_sun_nio_fs_GnomeFileTypeDetector_initializeGnomeVfs;

19
devel/jdk/1.8/patches/patch-jdk_src_solaris_classes_sun_nio_fs_BsdNativeDispatcher_java Normal file
View File

@ -0,0 +1,19 @@
$OpenBSD: patch-jdk_src_solaris_classes_sun_nio_fs_BsdNativeDispatcher_java,v 1.1 2019/11/21 17:39:08 tb Exp $
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=241317
Index: jdk/src/solaris/classes/sun/nio/fs/BsdNativeDispatcher.java
--- jdk/src/solaris/classes/sun/nio/fs/BsdNativeDispatcher.java.orig
+++ jdk/src/solaris/classes/sun/nio/fs/BsdNativeDispatcher.java
@@ -69,6 +69,11 @@ class BsdNativeDispatcher extends UnixNativeDispatcher
private static native void initIDs();
static {
+ AccessController.doPrivileged(new PrivilegedAction<Void>() {
+ public Void run() {
+ System.loadLibrary("nio");
+ return null;
+ }});
initIDs();
}
}