mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merged revisions 70849,70852 via svnmerge from

Browse source 
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
........
This commit is contained in:
Jesse Noller 2009-03-31 18:48:42 +00:00
parent ce9fbd3662
commit 32d68c2788
5 changed files with 18 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Misc/ACKS
View file

@ -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

2
Misc/NEWS
View file

@ -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

6
Modules/mmapmodule.c
View file

@ -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
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 #endif
if (newmap == (void *)-1) if (newmap == (void *)-1)
{ {

2
Modules/socketmodule.c
View file

@ -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

9
setup.py
View file

@ -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,