fix conditional build of libsctp for platforms that don't support sctp

6 files changed, 29 insertions, 36 deletions

diff --git a/lang/openjdk8/Makefile b/lang/openjdk8/Makefile
index 72b171eb430..05e644883b4 100644
--- a/lang/openjdk8/Makefile
+++ b/lang/openjdk8/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2015/03/02 04:26:40 tnn Exp $
+# $NetBSD: Makefile,v 1.11 2015/03/02 14:27:38 tnn Exp $
 
 DISTNAME=	openjdk-1.8.31-20150207
 PKGNAME=	openjdk8-1.8.31
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_LOCAL:=openjdk7/}
 EXTRACT_SUFX=	.tar.xz
@@ -124,6 +124,11 @@ SUBST_FILES.fontpaths+=		jdk/src/solaris/native/sun/awt/fontpath.c
 SUBST_SED.fontpaths=		-e 's|@PREFIX@|${PREFIX}|g'
 SUBST_SED.fontpaths+=		-e 's|@BUILDLINK_PREFIX.fontconfig@|${BUILDLINK_PREFIX.fontconfig}|g'
 
+PLIST_VARS+=	sctp
+.if ${OPSYS} == "FreeBSD"
+PLIST.sctp=	yes
+.endif
+
 post-extract:
 # These libs are bundled w/ the netbsd-7 bootstrap to facilitate building with
 # MKLLVM=yes / MKGCC=no. Nuke them from bootstrap if they are present in base.
diff --git a/lang/openjdk8/PLIST b/lang/openjdk8/PLIST
index 3387cdbf718..a2245352f47 100644
--- a/lang/openjdk8/PLIST
+++ b/lang/openjdk8/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2015/02/21 11:00:24 tnn Exp $
+@comment $NetBSD: PLIST,v 1.3 2015/03/02 14:27:38 tnn Exp $
 bin/openjdk8-jar
 bin/openjdk8-java
 bin/openjdk8-javac
@@ -374,7 +374,7 @@ java/openjdk8/jre/lib/${ARCH}/libnet.so
 java/openjdk8/jre/lib/${ARCH}/libnio.so
 java/openjdk8/jre/lib/${ARCH}/libnpt.so
 ${PLIST.native}java/openjdk8/jre/lib/${ARCH}/libsaproc.so
-java/openjdk8/jre/lib/${ARCH}/libsctp.so
+${PLIST.sctp}java/openjdk8/jre/lib/${ARCH}/libsctp.so
 ${PLIST.x11}java/openjdk8/jre/lib/${ARCH}/libsplashscreen.so
 java/openjdk8/jre/lib/${ARCH}/libsunec.so
 java/openjdk8/jre/lib/${ARCH}/libunpack.so
diff --git a/lang/openjdk8/distinfo b/lang/openjdk8/distinfo
index fa0ce514492..b424199e87e 100644
--- a/lang/openjdk8/distinfo
+++ b/lang/openjdk8/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2015/03/02 04:26:40 tnn Exp $
+$NetBSD: distinfo,v 1.14 2015/03/02 14:27:38 tnn Exp $
 
 SHA1 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 7408f52d3bbe35c2b14bbd3215cbf60f1335d334
 RMD160 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 24f1577b5fc86d137f070aedb4610c8c89e45815
@@ -59,6 +59,7 @@ SHA1 (patch-jdk_make_CompileLaunchers.gmk) = 76bae0aab5528a6c020d2fdd5ba7c1ffa13
 SHA1 (patch-jdk_make_CreateJars.gmk) = 0f49c8ec33121d7878ea4b6bd06d2e4e4af9a1d5
 SHA1 (patch-jdk_make_GenerateSources.gmk) = ec1b64805afb6edca637d87529b1d3fa59d20828
 SHA1 (patch-jdk_make_Images.gmk) = 7f3374554fa889ca2820f91f9dc1d34f2f39df0b
+SHA1 (patch-jdk_make_lib_NioLibraries.gmk) = 2498a90e948d9c9329230ab22ac447f06d2f2741
 SHA1 (patch-jdk_make_lib_SoundLibraries.gmk) = 27c33019f28d38efc0ae2c019b3e6e44863e8253
 SHA1 (patch-jdk_src_share_native_sun_awt_image_jpeg_imageioJPEG.c) = fe58fe992521c0ef8b7b60f8213bfcd714790c1e
 SHA1 (patch-jdk_src_share_native_sun_awt_image_jpeg_jpegdecoder.c) = 08270f0a9e0eacf6416a09e300429ccdc1bcdad8
@@ -72,8 +73,6 @@ SHA1 (patch-jdk_src_solaris_native_java_lang_java__props__md.c) = 6c6648c2716508
 SHA1 (patch-jdk_src_solaris_native_java_net_NetworkInterface.c) = ea06dc34b1c6dc08b7d1537ae129a3a2e3636f81
 SHA1 (patch-jdk_src_solaris_native_java_net_net__util__md.c) = c404a3520f82b8cc5eb906725aa2bc7f27cad801
 SHA1 (patch-jdk_src_solaris_native_sun_awt_X11Color.c) = cf0f8218e0088b677cd66fd5bc0d575ab08b710f
-SHA1 (patch-jdk_src_solaris_native_sun_nio_ch_sctp_SctpChannelImpl.c) = b0af426ab076dfef200bbe1575c3e0639a428c21
-SHA1 (patch-jdk_src_solaris_native_sun_nio_ch_sctp_SctpNet.c) = 7e348df7f390fc04d3097b7200b34bef885f067e
 SHA1 (patch-jdk_src_solaris_native_sun_security_pkcs11_j2secmod_md.c) = 6eb1f6b3cd62cb35a7b72cae7cb25bc5dc45fd9b
 SHA1 (patch-jdk_test_Makefile) = 36430647c444dea491ae0c916c6ad7b1a3607ec6
 SHA1 (patch-jdk_test_java_beans_Introspector_4168475_Test4168475.java) = 5fb2dd92820afcca5a04956d81e5244840b513f7
diff --git a/lang/openjdk8/patches/patch-jdk_make_lib_NioLibraries.gmk b/lang/openjdk8/patches/patch-jdk_make_lib_NioLibraries.gmk
new file mode 100644
index 00000000000..d7a979ef7f4
--- /dev/null
+++ b/lang/openjdk8/patches/patch-jdk_make_lib_NioLibraries.gmk
@@ -0,0 +1,18 @@
+$NetBSD: patch-jdk_make_lib_NioLibraries.gmk,v 1.1 2015/03/02 14:27:38 tnn Exp $
+
+--- jdk/make/lib/NioLibraries.gmk.orig	2015-02-02 15:37:11.000000000 +0000
++++ jdk/make/lib/NioLibraries.gmk
+@@ -185,9 +185,12 @@ $(BUILD_LIBNIO): $(BUILD_LIBNET)
+ 
+ ##########################################################################################
+ 
++ifeq (, $(OS_VENDOR))
++OS_VENDOR:=	$(shell uname -s)
++endif
+ ifeq ($(OPENJDK_TARGET_OS_API), posix)
+ 
+-  ifeq (, $(filter $(OPENJDK_TARGET_OS), macosx aix))
++  ifeq (, $(filter $(OS_VENDOR), AIX Darwin NetBSD DragonFly))
+ 
+     # Suppress unused parameters required by exported JNI functions.
+     SCTP_WERROR := -Werror -Wno-error=unused-parameter
diff --git a/lang/openjdk8/patches/patch-jdk_src_solaris_native_sun_nio_ch_sctp_SctpChannelImpl.c b/lang/openjdk8/patches/patch-jdk_src_solaris_native_sun_nio_ch_sctp_SctpChannelImpl.c
deleted file mode 100644
index 10a4cb6a96f..00000000000
--- a/lang/openjdk8/patches/patch-jdk_src_solaris_native_sun_nio_ch_sctp_SctpChannelImpl.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-jdk_src_solaris_native_sun_nio_ch_sctp_SctpChannelImpl.c,v 1.1 2015/02/08 08:41:25 tnn Exp $
-
---- jdk/src/solaris/native/sun/nio/ch/sctp/SctpChannelImpl.c.orig	2015-02-02 15:37:12.000000000 +0000
-+++ jdk/src/solaris/native/sun/nio/ch/sctp/SctpChannelImpl.c
-@@ -1,3 +1,4 @@
-+#if !defined(__NetBSD__)
- /*
-  * Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -613,4 +614,4 @@ JNIEXPORT jint JNICALL Java_sun_nio_ch_s
-     return Java_sun_nio_ch_SocketChannelImpl_checkConnect(env, this,
-                                                           fdo, block, ready);
- }
--
-+#endif
diff --git a/lang/openjdk8/patches/patch-jdk_src_solaris_native_sun_nio_ch_sctp_SctpNet.c b/lang/openjdk8/patches/patch-jdk_src_solaris_native_sun_nio_ch_sctp_SctpNet.c
deleted file mode 100644
index 45a1d70d101..00000000000
--- a/lang/openjdk8/patches/patch-jdk_src_solaris_native_sun_nio_ch_sctp_SctpNet.c
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-jdk_src_solaris_native_sun_nio_ch_sctp_SctpNet.c,v 1.1 2015/02/08 08:41:25 tnn Exp $
-
---- jdk/src/solaris/native/sun/nio/ch/sctp/SctpNet.c.orig	2015-02-02 15:37:12.000000000 +0000
-+++ jdk/src/solaris/native/sun/nio/ch/sctp/SctpNet.c
-@@ -1,3 +1,4 @@
-+#if !defined(__NetBSD__)
- /*
-  * Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -753,3 +754,4 @@ JNIEXPORT int JNICALL Java_sun_nio_ch_sc
- 
-     return newfd;
- }
-+#endif