diff options
| author | Greg Lewis <glewis@FreeBSD.org> | 2010-08-15 05:23:07 +0000 |
|---|---|---|
| committer | Greg Lewis <glewis@FreeBSD.org> | 2010-08-15 05:23:07 +0000 |
| commit | 9fd4613f5748835b2d74bb7beeed8d6ab4c2374d (patch) | |
| tree | 77b7e9d74dc08a7a0267bda0009fb47eccfadbd1 /java/openjdk6/files/patch-set | |
| parent | Forced commit to notify the repocopy is done: lang/python26 -> lang/python27 (diff) | |
. Port over davidxu@'s NIO selector that uses kqueue(2) from jdk16.
. Mark as MAKE_JOBS_UNSAFE.
Notes
Notes:
svn path=/head/; revision=259253
Diffstat (limited to 'java/openjdk6/files/patch-set')
| -rw-r--r-- | java/openjdk6/files/patch-set | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/java/openjdk6/files/patch-set b/java/openjdk6/files/patch-set index defa9f5ea9e3..6fd658f972dd 100644 --- a/java/openjdk6/files/patch-set +++ b/java/openjdk6/files/patch-set @@ -7318,15 +7318,6 @@ --- jdk/make/java/nio/Makefile 2010-06-21 14:15:08.000000000 -0700 +++ jdk/make/java/nio/Makefile 2010-06-20 21:56:16.000000000 -0700 -@@ -82,7 +82,7 @@ - sun/nio/ch/WindowsSelectorImpl.java - endif # PLATFORM = windows - --ifeq ($(PLATFORM), linux) -+ifneq (,$(findstring $(PLATFORM), linux bsd)) - FILES_java += \ - sun/nio/ch/AbstractPollSelectorImpl.java \ - sun/nio/ch/EPollArrayWrapper.java \ @@ -126,6 +126,11 @@ -I$(PLATFORM_SRC)/native/java/net \ -I$(CLASSHDRDIR)/../../../java.lang/java/CClassHeaders |