]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Apply patch for netbsd multiprocessing support
authorJesse Noller <jnoller@gmail.com>
Tue, 31 Mar 2009 18:12:35 +0000 (18:12 +0000)
committerJesse Noller <jnoller@gmail.com>
Tue, 31 Mar 2009 18:12:35 +0000 (18:12 +0000)
Modules/mmapmodule.c
Modules/socketmodule.c
setup.py

index d191c1e6fb122ed47e6113834052508f06db3913..bd7f7cc8889037531c0d93cffb8ccf6629b4d621 100644 (file)
@@ -509,7 +509,11 @@ mmap_resize_method(mmap_object *self,
 #ifdef MREMAP_MAYMOVE
                newmap = mremap(self->data, self->size, new_size, MREMAP_MAYMOVE);
 #else
-               newmap = mremap(self->data, self->size, new_size, 0);
+               #if defined(__NetBSD__)
+                       newmap = mremap(self->data, self->size, self->data, new_size, 0);
+               #else
+                       newmap = mremap(self->data, self->size, new_size, 0);
+               #endif /* __NetBSD__ */
 #endif
                if (newmap == (void *)-1)
                {
index 9cefe045ce1af50f32085b4590b2359b94c59fdf..b5f53a396f2e760cab45f7232cc4da3fb443b839 100644 (file)
@@ -379,7 +379,7 @@ const char *inet_ntop(int af, const void *src, char *dst, socklen_t size);
 #define SOCKETCLOSE close
 #endif
 
-#if defined(HAVE_BLUETOOTH_H) || defined(HAVE_BLUETOOTH_BLUETOOTH_H)
+#if defined(HAVE_BLUETOOTH_H) || defined(HAVE_BLUETOOTH_BLUETOOTH_H) &&  !defined(__NetBSD__)
 #define USE_BLUETOOTH 1
 #if defined(__FreeBSD__)
 #define BTPROTO_L2CAP BLUETOOTH_PROTO_L2CAP
index f1e983d3f0fc5d69b15e4fb7acda6e05ced3d248..d3b39bad41605d01e7599ff522f90090c3dea870 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -1280,6 +1280,15 @@ class PyBuildExt(build_ext):
                 )
             libraries = []
 
+        elif platform.startswith('netbsd'):
+            macros = dict(                  # at least NetBSD 5
+                HAVE_SEM_OPEN=1,
+                HAVE_SEM_TIMEDWAIT=0,
+                HAVE_FD_TRANSFER=1,
+                HAVE_BROKEN_SEM_GETVALUE=1
+                )
+            libraries = []
+
         else:                                   # Linux and other unices
             macros = dict(
                 HAVE_SEM_OPEN=1,