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

Fix file interaction

Browse Source 
* Load libnio in BsdNativeDispatcher, as per other OSes
* Export getmntonname0 from libnio

PR:		241317
Submitted by:	cmt@
This commit is contained in:
Greg Lewis 2019-10-17 22:39:05 +00:00
parent bb53490be2
commit eb5f920507
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=514690
3 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
java/openjdk8/Makefile
View File

@ -2,6 +2,7 @@
PORTNAME= openjdk
PORTVERSION= ${JDK_MAJOR_VERSION}.${JDK_UPDATE_VERSION}.${JDK_BUILD_NUMBER}.${BSD_JDK_VERSION}
PORTREVISION= 1
CATEGORIES= java devel
MASTER_SITES= LOCAL/jkim:jtreg
PKGNAMESUFFIX?= ${JDK_MAJOR_VERSION}

18
java/openjdk8/files/patch-jdk-make-mapfiles-libnio-mapfile-bsd
View File

@ -1,14 +1,22 @@
--- jdk/make/mapfiles/libnio/mapfile-bsd
--- jdk/make/mapfiles/libnio/mapfile-bsd.orig 2019-10-17 21:15:55 UTC
+++ jdk/make/mapfiles/libnio/mapfile-bsd
@@ -42,6 +42,7 @@ SUNWprivate_1.1 {
Java_sun_nio_ch_FileChannelImpl_position0;
@@ -41,6 +41,7 @@ SUNWprivate_1.1 {
Java_sun_nio_ch_FileChannelImpl_map0;
Java_sun_nio_ch_FileChannelImpl_transferTo0;
Java_sun_nio_ch_FileChannelImpl_unmap0;
+ Java_sun_nio_ch_FileDispatcherImpl_allocate0;
Java_sun_nio_ch_FileDispatcherImpl_close0;
Java_sun_nio_ch_FileDispatcherImpl_closeIntFD;
Java_sun_nio_ch_FileDispatcherImpl_force0;
@@ -143,6 +144,14 @@ SUNWprivate_1.1 {
Java_sun_nio_ch_FileDispatcherImpl_seek0;
@@ -135,6 +136,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;
@@ -143,6 +145,14 @@ SUNWprivate_1.1 {
Java_sun_nio_fs_MagicFileTypeDetector_initialize0;
Java_sun_nio_fs_MagicFileTypeDetector_probe0;
Java_sun_nio_fs_UnixCopyFile_transfer;

14
java/openjdk8/files/patch-jdk-src-solaris-classes-sun-nio-fs-BsdNativeDispatcher.java Normal file
View File

@ -0,0 +1,14 @@
--- jdk/src/solaris/classes/sun/nio/fs/BsdNativeDispatcher.java.orig 2019-10-17 19:49:41 UTC
+++ 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();
}
}