Attachment 149295 Details for Bug 194941 – Fix libnio.so

[patch] Fix libnio.so

openjdk8.diff (text/plain), 2.02 KB, created by Jung-uk Kim on 2014-11-11 20:53:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jung-uk Kim

Created: 2014-11-11 20:53:57 UTC

Size: 2.02 KB

patch

obsolete

>Index: java/openjdk8/Makefile
>===================================================================
>--- java/openjdk8/Makefile	(revision 372461)
>+++ java/openjdk8/Makefile	(working copy)
>@@ -2,6 +2,7 @@
> 
> PORTNAME=	openjdk
> PORTVERSION=	${JDK_MAJOR_VERSION}.${JDK_UPDATE_VERSION}.${JDK_BUILD_NUMBER:S/^0//}
>+PORTREVISION=	1
> CATEGORIES=	java devel
> MASTER_SITES=	http://download.java.net/openjdk/jdk${JDK_MAJOR_VERSION}/promoted/b${DIST_BUILD_NUMBER}/:jdk \
> 		https://adopt-openjdk.ci.cloudbees.com/job/jtreg/${JTREG_JENKINS_BUILD}/artifact/:jtreg \
>Index: java/openjdk8/files/patch-bsd
>===================================================================
>--- java/openjdk8/files/patch-bsd	(revision 372461)
>+++ java/openjdk8/files/patch-bsd	(working copy)
>@@ -6189,12 +6189,13 @@
>          -DELAYLOAD:secur32.dll -DELAYLOAD:iphlpapi.dll, \
> --- ./jdk/make/lib/NioLibraries.gmk	Tue Sep 09 12:00:58 2014 -0700
> +++ ./jdk/make/lib/NioLibraries.gmk	Wed Nov 05 12:14:24 2014 -0800
>-@@ -77,9 +77,27 @@
>+@@ -77,9 +77,28 @@
>        UnixNativeDispatcher.c
>  endif
>  
> +ifeq ($(OPENJDK_TARGET_OS), bsd)
> +  BUILD_LIBNIO_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libnio/mapfile-$(OPENJDK_TARGET_OS)
>++  BUILD_LIBNIO_SRC += $(JDK_TOPDIR)/src/bsd/native/sun/nio/ch
> +  BUILD_LIBNIO_FILES += \
> +      BsdNativeDispatcher.c \
> +      GnomeFileTypeDetector.c \
>@@ -6218,7 +6219,7 @@
>    BUILD_LIBNIO_FILES += \
>        InheritedChannel.c \
>        NativeThread.c \
>-@@ -149,6 +167,7 @@
>+@@ -149,6 +168,7 @@
>      LDFLAGS_SUFFIX_windows := jvm.lib ws2_32.lib $(WIN_JAVA_LIB) \
>          $(JDK_OUTPUTDIR)/objs/libnet/net.lib \
>          advapi32.lib, \
>@@ -6226,7 +6227,7 @@
>      LDFLAGS_SUFFIX_macosx := -ljava -lnet -pthread -framework CoreFoundation, \
>      LDFLAGS_SUFFIX :=, \
>      VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
>-@@ -194,6 +213,7 @@
>+@@ -194,6 +214,7 @@
>          LDFLAGS_SUFFIX_linux := -lpthread $(LIBDL) -ljava -ljvm, \
>          LDFLAGS_SUFFIX_posix := -lnio -lnet, \
>          LDFLAGS_SUFFIX_solaris := -lsocket -ljava -ljvm -lc, \

Actions: View | Diff

Attachments on bug 194941: 149295 | 149301