Commit 32d68c27 authored by Jesse Noller's avatar Jesse Noller

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
........
parent ce9fbd36
...@@ -492,6 +492,7 @@ James A Morrison ...@@ -492,6 +492,7 @@ James A Morrison
Sjoerd Mullender Sjoerd Mullender
Sape Mullender Sape Mullender
Michael Muller Michael Muller
Piotr Meyer
John Nagle John Nagle
Takahiro Nakayama Takahiro Nakayama
Travers Naran Travers Naran
......
...@@ -53,6 +53,8 @@ Core and Builtins ...@@ -53,6 +53,8 @@ Core and Builtins
Library Library
------- -------
- Issue #5400: Added patch for multiprocessing on netbsd compilation/support
- Issue #5387: Fixed mmap.move crash by integer overflow. - Issue #5387: Fixed mmap.move crash by integer overflow.
- Issue #5261: Patch multiprocessing's semaphore.c to support context - Issue #5261: Patch multiprocessing's semaphore.c to support context
......
...@@ -520,7 +520,11 @@ mmap_resize_method(mmap_object *self, ...@@ -520,7 +520,11 @@ mmap_resize_method(mmap_object *self,
#ifdef MREMAP_MAYMOVE #ifdef MREMAP_MAYMOVE
newmap = mremap(self->data, self->size, new_size, MREMAP_MAYMOVE); newmap = mremap(self->data, self->size, new_size, MREMAP_MAYMOVE);
#else #else
#if defined(__NetBSD__)
newmap = mremap(self->data, self->size, self->data, new_size, 0);
#else
newmap = mremap(self->data, self->size, new_size, 0); newmap = mremap(self->data, self->size, new_size, 0);
#endif /* __NetBSD__ */
#endif #endif
if (newmap == (void *)-1) if (newmap == (void *)-1)
{ {
......
...@@ -382,7 +382,7 @@ dup_socket(SOCKET handle) ...@@ -382,7 +382,7 @@ dup_socket(SOCKET handle)
#define SOCKETCLOSE close #define SOCKETCLOSE close
#endif #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 #define USE_BLUETOOTH 1
#if defined(__FreeBSD__) #if defined(__FreeBSD__)
#define BTPROTO_L2CAP BLUETOOTH_PROTO_L2CAP #define BTPROTO_L2CAP BLUETOOTH_PROTO_L2CAP
......
...@@ -1023,6 +1023,15 @@ class PyBuildExt(build_ext): ...@@ -1023,6 +1023,15 @@ class PyBuildExt(build_ext):
) )
libraries = [] 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 else: # Linux and other unices
macros = dict( macros = dict(
HAVE_SEM_OPEN=1, HAVE_SEM_OPEN=1,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment