Attachment #149295 for bug #194941

Lines 2-7 Link Here

(-)java/openjdk8/Makefile (+1 lines)
2		2
3	PORTNAME= openjdk	3	PORTNAME= openjdk
4	PORTVERSION= ${JDK_MAJOR_VERSION}.${JDK_UPDATE_VERSION}.${JDK_BUILD_NUMBER:S/^0//}	4	PORTVERSION= ${JDK_MAJOR_VERSION}.${JDK_UPDATE_VERSION}.${JDK_BUILD_NUMBER:S/^0//}
		5	PORTREVISION= 1
5	CATEGORIES= java devel	6	CATEGORIES= java devel
6	MASTER_SITES= http://download.java.net/openjdk/jdk${JDK_MAJOR_VERSION}/promoted/b${DIST_BUILD_NUMBER}/:jdk \	7	MASTER_SITES= http://download.java.net/openjdk/jdk${JDK_MAJOR_VERSION}/promoted/b${DIST_BUILD_NUMBER}/:jdk \
7	https://adopt-openjdk.ci.cloudbees.com/job/jtreg/${JTREG_JENKINS_BUILD}/artifact/:jtreg \	8	https://adopt-openjdk.ci.cloudbees.com/job/jtreg/${JTREG_JENKINS_BUILD}/artifact/:jtreg \




         -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,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 \

   BUILD_LIBNIO_FILES += \
       InheritedChannel.c \
       NativeThread.c \
@@ -149,6 +168,7 @@
     LDFLAGS_SUFFIX_windows := jvm.lib ws2_32.lib $(WIN_JAVA_LIB) \
         $(JDK_OUTPUTDIR)/objs/libnet/net.lib \
         advapi32.lib, \

     LDFLAGS_SUFFIX_macosx := -ljava -lnet -pthread -framework CoreFoundation, \
     LDFLAGS_SUFFIX :=, \
     VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
@@ -194,6 +214,7 @@
         LDFLAGS_SUFFIX_linux := -lpthread $(LIBDL) -ljava -ljvm, \
         LDFLAGS_SUFFIX_posix := -lnio -lnet, \
         LDFLAGS_SUFFIX_solaris := -lsocket -ljava -ljvm -lc, \

Return to bug 194941

Lines 6189-6200 Link Here

(-)java/openjdk8/files/patch-bsd (-3 / +4 lines)
6189	-DELAYLOAD:secur32.dll -DELAYLOAD:iphlpapi.dll, \	6189	-DELAYLOAD:secur32.dll -DELAYLOAD:iphlpapi.dll, \
6190	--- ./jdk/make/lib/NioLibraries.gmk Tue Sep 09 12:00:58 2014 -0700	6190	--- ./jdk/make/lib/NioLibraries.gmk Tue Sep 09 12:00:58 2014 -0700
6191	+++ ./jdk/make/lib/NioLibraries.gmk Wed Nov 05 12:14:24 2014 -0800	6191	+++ ./jdk/make/lib/NioLibraries.gmk Wed Nov 05 12:14:24 2014 -0800
6192	@@ -77,9 +77,27 @@	6192	@@ -77,9 +77,28 @@
6193	UnixNativeDispatcher.c	6193	UnixNativeDispatcher.c
6194	endif	6194	endif
6195		6195
6196	+ifeq ($(OPENJDK_TARGET_OS), bsd)	6196	+ifeq ($(OPENJDK_TARGET_OS), bsd)
6197	+ BUILD_LIBNIO_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libnio/mapfile-$(OPENJDK_TARGET_OS)	6197	+ BUILD_LIBNIO_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libnio/mapfile-$(OPENJDK_TARGET_OS)
		6198	+ BUILD_LIBNIO_SRC += $(JDK_TOPDIR)/src/bsd/native/sun/nio/ch
6198	+ BUILD_LIBNIO_FILES += \	6199	+ BUILD_LIBNIO_FILES += \
6199	+ BsdNativeDispatcher.c \	6200	+ BsdNativeDispatcher.c \
6200	+ GnomeFileTypeDetector.c \	6201	+ GnomeFileTypeDetector.c \
Lines 6218-6224 Link Here
6218	BUILD_LIBNIO_FILES += \	6219	BUILD_LIBNIO_FILES += \
6219	InheritedChannel.c \	6220	InheritedChannel.c \
6220	NativeThread.c \	6221	NativeThread.c \
6221	@@ -149,6 +167,7 @@	6222	@@ -149,6 +168,7 @@
6222	LDFLAGS_SUFFIX_windows := jvm.lib ws2_32.lib $(WIN_JAVA_LIB) \	6223	LDFLAGS_SUFFIX_windows := jvm.lib ws2_32.lib $(WIN_JAVA_LIB) \
6223	$(JDK_OUTPUTDIR)/objs/libnet/net.lib \	6224	$(JDK_OUTPUTDIR)/objs/libnet/net.lib \
6224	advapi32.lib, \	6225	advapi32.lib, \
Lines 6226-6232 Link Here
6226	LDFLAGS_SUFFIX_macosx := -ljava -lnet -pthread -framework CoreFoundation, \	6227	LDFLAGS_SUFFIX_macosx := -ljava -lnet -pthread -framework CoreFoundation, \
6227	LDFLAGS_SUFFIX :=, \	6228	LDFLAGS_SUFFIX :=, \
6228	VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \	6229	VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
6229	@@ -194,6 +213,7 @@	6230	@@ -194,6 +214,7 @@
6230	LDFLAGS_SUFFIX_linux := -lpthread $(LIBDL) -ljava -ljvm, \	6231	LDFLAGS_SUFFIX_linux := -lpthread $(LIBDL) -ljava -ljvm, \
6231	LDFLAGS_SUFFIX_posix := -lnio -lnet, \	6232	LDFLAGS_SUFFIX_posix := -lnio -lnet, \
6232	LDFLAGS_SUFFIX_solaris := -lsocket -ljava -ljvm -lc, \	6233	LDFLAGS_SUFFIX_solaris := -lsocket -ljava -ljvm -lc, \