[Python-checkins] r70862 - in python/branches/py3k: Misc/ACKS Misc/NEWS Modules/mmapmodule.c Modules/socketmodule.c setup.py

[jesse.noller]

Author: jesse.noller
Date: Tue Mar 31 20:48:42 2009
New Revision: 70862

Log:
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
........


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Misc/ACKS
   python/branches/py3k/Misc/NEWS
   python/branches/py3k/Modules/mmapmodule.c
   python/branches/py3k/Modules/socketmodule.c
   python/branches/py3k/setup.py

Modified: python/branches/py3k/Misc/ACKS
==============================================================================
--- python/branches/py3k/Misc/ACKS	(original)
+++ python/branches/py3k/Misc/ACKS	Tue Mar 31 20:48:42 2009
@@ -492,6 +492,7 @@
 Sjoerd Mullender
 Sape Mullender
 Michael Muller
+Piotr Meyer
 John Nagle
 Takahiro Nakayama
 Travers Naran

Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS	(original)
+++ python/branches/py3k/Misc/NEWS	Tue Mar 31 20:48:42 2009
@@ -53,6 +53,8 @@
 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

Modified: python/branches/py3k/Modules/mmapmodule.c
==============================================================================
--- python/branches/py3k/Modules/mmapmodule.c	(original)
+++ python/branches/py3k/Modules/mmapmodule.c	Tue Mar 31 20:48:42 2009
@@ -520,7 +520,11 @@
 #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)
 		{

Modified: python/branches/py3k/Modules/socketmodule.c
==============================================================================
--- python/branches/py3k/Modules/socketmodule.c	(original)
+++ python/branches/py3k/Modules/socketmodule.c	Tue Mar 31 20:48:42 2009
@@ -382,7 +382,7 @@
 #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

Modified: python/branches/py3k/setup.py
==============================================================================
--- python/branches/py3k/setup.py	(original)
+++ python/branches/py3k/setup.py	Tue Mar 31 20:48:42 2009
@@ -1023,6 +1023,15 @@
                 )
             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,