On Wed, 2019-11-20 at 17:29 +0100, Theo Buehler wrote:
> On Wed, Nov 20, 2019 at 03:59:12PM +0100, Solene Rapenne wrote:
> > 
> > lang/scala is quite broken, trying to interpret the following program using
> > scala file.scala produce an error
> > 
> > if I paste the same program in the REPL, it works correctly.
> > 
> > Program:
> > 
> > import java.io._
> > def main() { println("hello"); }
> The diff below, taken from
> https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=241317
> fixes this for me:


looks correct to me. okay kurt@

> Index: Makefile
> ===================================================================
> RCS file: /var/cvs/ports/devel/jdk/1.8/Makefile,v
> retrieving revision 1.47
> diff -u -p -r1.47 Makefile
> --- Makefile  26 Oct 2019 17:03:11 -0000      1.47
> +++ Makefile  20 Nov 2019 16:25:07 -0000
> @@ -13,6 +13,7 @@ V=          ${BASE_VER}.${UPDATE_VER}.${BUILD_VE
>  PKGNAME=     jdk-${V}
>  PKGSTEM=     jdk-${BASE_VER}
>  EPOCH=               0
> +REVISION=    0
>  
>  DIST_SUBDIR= jdk
>  DISTNAME=    jdk8u${UPDATE_VER}-${BUILD_VER}.${BSD_PORT_REL}
> Index: patches/patch-jdk_make_mapfiles_libnio_mapfile-bsd
> ===================================================================
> RCS file: patches/patch-jdk_make_mapfiles_libnio_mapfile-bsd
> diff -N patches/patch-jdk_make_mapfiles_libnio_mapfile-bsd
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-jdk_make_mapfiles_libnio_mapfile-bsd        20 Nov 2019 
> 16:05:22 -0000
> @@ -0,0 +1,15 @@
> +$OpenBSD$
> +
> +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;
> Index: 
> patches/patch-jdk_src_solaris_classes_sun_nio_fs_BsdNativeDispatcher_java
> ===================================================================
> RCS file: 
> patches/patch-jdk_src_solaris_classes_sun_nio_fs_BsdNativeDispatcher_java
> diff -N 
> patches/patch-jdk_src_solaris_classes_sun_nio_fs_BsdNativeDispatcher_java
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-jdk_src_solaris_classes_sun_nio_fs_BsdNativeDispatcher_java 
> 20 Nov 2019 16:05:30 -0000
> @@ -0,0 +1,19 @@
> +$OpenBSD$
> +
> +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();
> +     }
> + }

Reply via email to