changeset 1281:ab596c2ff1b2

. Reenable the NIO2 build for *BSD, but only build the SCTP code on FreeBSD 7.x and higher.
author glewis@misty.eyesbeyond.com
date Sat, 13 Jun 2009 17:36:06 -0700
parents 9dca23e57111
children f2850716de0c
files make/com/sun/Makefile make/com/sun/nio/Makefile make/com/sun/nio/sctp/Makefile
diffstat 3 files changed, 13 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/make/com/sun/Makefile	Fri Jun 12 15:53:29 2009 -0400
+++ b/make/com/sun/Makefile	Sat Jun 13 17:36:06 2009 -0700
@@ -38,12 +38,10 @@
   endif
 endif
 
-# XXXBSD: removed nio subdir to avoid building java.nio.sctp for now
-
 # Omit mirror since it's built with the apt tool.
 SUBDIRS = $(SCRIPT_SUBDIR) image security crypto/provider jndi jmx \
     java inputmethods org xml rowset net/httpserver net/ssl demo \
-    tools jarsigner tracing servicetag
+    tools jarsigner tracing servicetag nio
 
 all build clean clobber::
 	$(SUBDIRS-loop)
--- a/make/com/sun/nio/Makefile	Fri Jun 12 15:53:29 2009 -0400
+++ b/make/com/sun/nio/Makefile	Sat Jun 13 17:36:06 2009 -0700
@@ -30,7 +30,16 @@
 BUILDDIR = ../../..
 include $(BUILDDIR)/common/Defs.gmk
 
+ifneq ($(PLATFORM), bsd)
 SUBDIRS = sctp
+else
+ifeq ($(OS_VENDOR), FreeBSD)
+# FreeBSD 5.x and lower are unsupported, 6.x has no sctp support.
+ifneq ($(call MajorVersion,$(shell uname -r)), 6)
+SUBDIRS = sctp
+endif
+endif
+endif
 all build clean clobber::
 	$(SUBDIRS-loop)
 
--- a/make/com/sun/nio/sctp/Makefile	Fri Jun 12 15:53:29 2009 -0400
+++ b/make/com/sun/nio/sctp/Makefile	Sat Jun 13 17:36:06 2009 -0700
@@ -68,6 +68,9 @@
 #LIBSCTP = -lsctp
 OTHER_LDLIBS += $(LIBSOCKET) -L$(LIBDIR)/$(LIBARCH) -lnet -lnio
 endif # PLATFORM
+ifeq ($(PLATFORM), bsd)
+OTHER_LDLIBS += $(LIBSOCKET) -L$(LIBDIR)/$(LIBARCH) -lnet -lnio
+endif
 
 else # windows
 include $(BUILDDIR)/common/Classes.gmk