Attachment 211358 Details for Bug 243454 – java/openjdk8: Remove broken inotify compatibility

[patch] java/openjdk8: Remove broken inotify compatibility

openjdk8.diff (text/plain), 3.28 KB, created by Romain Tartière on 2020-02-04 21:13:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Romain Tartière

Created: 2020-02-04 21:13:45 UTC

Size: 3.28 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(rÃ©vision 525008)
>+++ Makefile	(copie de travail)
>@@ -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,8 +19,7 @@
> 		${LOCALBASE}/include/cups/cups.h:print/cups \
> 		bash:shells/bash
> LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
>-		libfreetype.so:print/freetype2 \
>-		libinotify.so:devel/libinotify
>+		libfreetype.so:print/freetype2
> RUN_DEPENDS=	javavm:java/javavmwrapper \
> 		dejavu>0:x11-fonts/dejavu
> 
>Index: files/patch-jdk-make-lib-NioLibraries.gmk
>===================================================================
>--- files/patch-jdk-make-lib-NioLibraries.gmk	(rÃ©vision 525008)
>+++ files/patch-jdk-make-lib-NioLibraries.gmk	(nonexistent)
>@@ -1,14 +0,0 @@
>---- ./jdk/make/lib/NioLibraries.gmk.orig	2018-12-13 14:21:04.047810000 +0100
>-+++ ./jdk/make/lib/NioLibraries.gmk	2018-12-13 14:48:16.288168000 +0100
>-@@ -92,8 +92,11 @@
>-       PollArrayWrapper.c \
>-       UnixAsynchronousServerSocketChannelImpl.c \
>-       UnixAsynchronousSocketChannelImpl.c \
>-+      LinuxWatchService.c \
>-       UnixCopyFile.c \
>-       UnixNativeDispatcher.c
>-+  BUILD_LIBNIO_CFLAGS += -I%%LOCALBASE%%/include
>-+  BUILD_LIBNIO_LDFLAGS += -L%%LOCALBASE%%/lib -linotify
>- endif
>- 
>- ifeq ($(OPENJDK_TARGET_OS), macosx)
>
>Property changes on: files/patch-jdk-make-lib-NioLibraries.gmk
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-jdk-src-solaris-classes-sun-nio-fs-BsdFileSystem.java
>===================================================================
>--- files/patch-jdk-src-solaris-classes-sun-nio-fs-BsdFileSystem.java	(rÃ©vision 525008)
>+++ files/patch-jdk-src-solaris-classes-sun-nio-fs-BsdFileSystem.java	(nonexistent)
>@@ -1,15 +0,0 @@
>---- ./jdk/src/solaris/classes/sun/nio/fs/BsdFileSystem.java.orig	2018-12-13 14:23:02.834223000 +0100
>-+++ ./jdk/src/solaris/classes/sun/nio/fs/BsdFileSystem.java	2018-12-13 17:34:09.359192000 +0100
>-@@ -45,8 +45,10 @@
>-     public WatchService newWatchService()
>-         throws IOException
>-     {
>--        // use polling implementation until we implement a BSD/kqueue one
>--        return new PollingWatchService();
>-+        if (System.getProperty("sun.nio.fs.watchservice", "").equals("polling"))
>-+            return new PollingWatchService();
>-+        else
>-+            return new LinuxWatchService(this); // use the linux inotify implementation that wraps the kqueue calls
>-     }
>- 
>-     // lazy initialization of the list of supported attribute views
>
>Property changes on: files/patch-jdk-src-solaris-classes-sun-nio-fs-BsdFileSystem.java
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 243454: 210875 | 210917 | 211358 | 213200