Merged revisions 70849,70852 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r70849 | jesse.noller | 2009-03-31 13:12:35 -0500 (Tue, 31 Mar 2009) | 1 line

  Apply patch for netbsd multiprocessing support
........
  r70852 | jesse.noller | 2009-03-31 13:27:14 -0500 (Tue, 31 Mar 2009) | 1 line

  missed the news/acks for netbsd patch
........

diff --git a/Misc/ACKS b/Misc/ACKS
index bd300de67e39fbbe6c522527623297ec3df84ac7..7d4c1bf036cce70844d75673e5c6cd81056ff193 100644 (file)
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -492,6 +492,7 @@ James A Morrison
 Sjoerd Mullender
 Sape Mullender
 Michael Muller
+Piotr Meyer
 John Nagle
 Takahiro Nakayama
 Travers Naran

diff --git a/Misc/NEWS b/Misc/NEWS
index d78220e8b1d485145a73e0fc38de02b0c101b1c4..a52e37aa0eef21150cb914b2391c2eb55154b451 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -53,6 +53,8 @@ Core and Builtins
 Library
 -------
 
+- Issue #5400: Added patch for multiprocessing on netbsd compilation/support
+
 - Issue #5387: Fixed mmap.move crash by integer overflow.
 
 - Issue #5261: Patch multiprocessing's semaphore.c to support context

diff --git a/Modules/mmapmodule.c b/Modules/mmapmodule.c
index d903eca9d940bc62ce2b4db6d508a5850a7ca9a8..c6c8a301826ec7ae0f5756f492b4853319b08d0d 100644 (file)
--- a/Modules/mmapmodule.c
+++ b/Modules/mmapmodule.c
@@ -520,7 +520,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)
                {

diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index 35809ee86df2f6eeedf64bf7204387ba80094be9..c229c07252bca23ba3bc6cc17825e4a2cc24f629 100644 (file)
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -382,7 +382,7 @@ dup_socket(SOCKET handle)
 #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

diff --git a/setup.py b/setup.py
index 522eb82addc3274d829ef36c313bcd9a693eca06..3c2517243507ea55cbd4ef8f37224efbf2f6a29a 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -1023,6 +1023,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,