Author: benjamin.peterson Date: Sat Jan 30 21:00:35 2010 New Revision: 77865 Log: Merged revisions 68874 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r68874 | jesse.noller | 2009-01-23 08:04:41 -0600 (Fri, 23 Jan 2009) | 1 line Issue 3807: multiprocessing fails to compile under --without-threads ........ Modified: python/branches/release26-maint/ (props changed) python/branches/release26-maint/Misc/NEWS python/branches/release26-maint/setup.py Modified: python/branches/release26-maint/Misc/NEWS ============================================================================== --- python/branches/release26-maint/Misc/NEWS (original) +++ python/branches/release26-maint/Misc/NEWS Sat Jan 30 21:00:35 2010 @@ -775,6 +775,10 @@ - Issue #5387: Fixed mmap.move crash by integer overflow. +- Issue #3807: _multiprocessing build fails when configure is passed + --without-threads argument. When this occurs, _multiprocessing will + be disabled, and not compiled. + - Issue #5261: Patch multiprocessing's semaphore.c to support context manager use: "with multiprocessing.Lock()" works now. Modified: python/branches/release26-maint/setup.py ============================================================================== --- python/branches/release26-maint/setup.py (original) +++ python/branches/release26-maint/setup.py Sat Jan 30 21:00:35 2010 @@ -1325,9 +1325,13 @@ if macros.get('HAVE_SEM_OPEN', False): multiprocessing_srcs.append('_multiprocessing/semaphore.c') - exts.append ( Extension('_multiprocessing', multiprocessing_srcs, - define_macros=macros.items(), - include_dirs=["Modules/_multiprocessing"])) + if sysconfig.get_config_var('WITH_THREAD'): + exts.append ( Extension('_multiprocessing', multiprocessing_srcs, + define_macros=macros.items(), + include_dirs=["Modules/_multiprocessing"])) + else: + missing.append('_multiprocessing') + # End multiprocessing