kfreebsd port

Last-Update: 2015-09-19
Forwarded: not yet

===================================================================

Gbp-Pq: Name kfreebsd.patch

diff --git a/configure.ac b/configure.ac
index d9251f31985427baa71b9072c84ec7ef02332ccf..5581b9dc3838b75b4992be2641ec8222f952fcfa 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -53,6 +53,7 @@ AM_CONDITIONAL([ANDROID],  [AS_CASE([$host_os],[linux-android*],[true], [false])
 AM_CONDITIONAL([DARWIN],   [AS_CASE([$host_os],[darwin*],       [true], [false])])
 AM_CONDITIONAL([DRAGONFLY],[AS_CASE([$host_os],[dragonfly*],    [true], [false])])
 AM_CONDITIONAL([FREEBSD],  [AS_CASE([$host_os],[freebsd*],      [true], [false])])
+AM_CONDITIONAL([FREEBSD],  [AS_CASE([$host_os],[*freebsd*],      [true], [false])])
 AM_CONDITIONAL([LINUX],    [AS_CASE([$host_os],[linux*],        [true], [false])])
 AM_CONDITIONAL([NETBSD],   [AS_CASE([$host_os],[netbsd*],       [true], [false])])
 AM_CONDITIONAL([OPENBSD],  [AS_CASE([$host_os],[openbsd*],      [true], [false])])

diff --git a/include/uv-unix.h b/include/uv-unix.h
index a852c40e49baa5f5e8d2f5bbc3f2c7334eae8a42..eccf8836c4238ef0ff038467041a8b3361b877e9 100644 (file)
--- a/include/uv-unix.h
+++ b/include/uv-unix.h
@@ -51,7 +51,7 @@
 #elif defined(__APPLE__)
 # include "uv-darwin.h"
 #elif defined(__DragonFly__)  || \
-      defined(__FreeBSD__)    || \
+      defined(__FreeBSD_kernel__)    || \
       defined(__OpenBSD__)    || \
       defined(__NetBSD__)
 # include "uv-bsd.h"

diff --git a/src/unix/core.c b/src/unix/core.c
index cdcd0b504f32f4c8b7b3bf75c85baae45b27b622..e9b224efc0f20216b3f8b788de7a9881368368e6 100644 (file)
--- a/src/unix/core.c
+++ b/src/unix/core.c
@@ -58,7 +58,7 @@
 # endif
 #endif
 
-#if defined(__FreeBSD__) || defined(__DragonFly__)
+#if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__)
 # include <sys/sysctl.h>
 # include <sys/filio.h>
 # include <sys/ioctl.h>
@@ -524,7 +524,7 @@ int uv__close(int fd) {
 
 
 #if defined(__linux__) || defined(__FreeBSD__) || defined(__APPLE__) || \
-    defined(_AIX) || defined(__DragonFly__)
+    defined(_AIX) || defined(__DragonFly__) || defined(__FreeBSD_kernel__)
 
 int uv__nonblock(int fd, int set) {
   int r;
@@ -554,7 +554,7 @@ int uv__cloexec(int fd, int set) {
 }
 
 #else /* !(defined(__linux__) || defined(__FreeBSD__) || defined(__APPLE__) || \
-          defined(_AIX) || defined(__DragonFly__)) */
+          defined(_AIX) || defined(__DragonFly__) || defined(__FreeBSD_kernel__)) */
 
 int uv__nonblock(int fd, int set) {
   int flags;
@@ -618,7 +618,7 @@ int uv__cloexec(int fd, int set) {
 }
 
 #endif /* defined(__linux__) || defined(__FreeBSD__) || defined(__APPLE__) || \
-         defined(_AIX) || defined(__DragonFly__) */
+         defined(_AIX) || defined(__DragonFly__) || defined(__FreeBSD_kernel__) */
 
 
 /* This function is not execve-safe, there is a race window

diff --git a/src/unix/fs.c b/src/unix/fs.c
index 085970a06d9e7b2f9f6c0b2841b338b4a380f673..0e6d9a1916d205d5e96cd91392d9f8f397da9dce 100644 (file)
--- a/src/unix/fs.c
+++ b/src/unix/fs.c
@@ -193,6 +193,7 @@ skip:
 #elif defined(__APPLE__)                                                      \
     || defined(__DragonFly__)                                                 \
     || defined(__FreeBSD__)                                                   \
+    || defined(__FreeBSD_kernel__)                                            \
     || defined(__NetBSD__)                                                    \
     || defined(__OpenBSD__)                                                   \
     || defined(__sun)

diff --git a/test/test-fs-event.c b/test/test-fs-event.c
index 353c43b0de4e0707555e665dfef808693b120519..6f23e47c2a67953912c6f70b615ebc6b39ece775 100644 (file)
--- a/test/test-fs-event.c
+++ b/test/test-fs-event.c
@@ -29,6 +29,7 @@
 # if defined(__APPLE__) ||                                                    \
      defined(__DragonFly__) ||                                                \
      defined(__FreeBSD__) ||                                                  \
+     defined(__FreeBSD_kernel__) ||                                           \
      defined(__OpenBSD__) ||                                                  \
      defined(__NetBSD__)
 #  define HAVE_KQUEUE 1