merge 68874 to py3kwq!

diff --git a/Misc/NEWS b/Misc/NEWS
index 2d18011d5142066aba4c5290314782a22c0d85fa..cf9e88558d6545ea97f59c5b2eca44a943caf7e3 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -139,6 +139,10 @@ Core and Builtins
 Library
 -------
 
+- Issue #3807: _multiprocessing build fails when configure is passed 
+  --without-threads argument. When this occurs, _multiprocessing will
+  be disabled, and not compiled.
+
 - Issue #5008: When a file is opened in append mode with the new IO library,
   do an explicit seek to the end of file (so that e.g. tell() returns the
   file size rather than 0). This is consistent with the behaviour of the

diff --git a/setup.py b/setup.py
index 27d1fe1570f940b1c104b63e505f5058a8505b3b..174a8b2cd4e87a010892514d35cc577beaa5df4c 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -1063,9 +1063,12 @@ class PyBuildExt(build_ext):
             if macros.get('HAVE_SEM_OPEN', False):
                 multiprocessing_srcs.append('_multiprocessing/semaphore.c')
 
-        exts.append ( Extension('_multiprocessing', multiprocessing_srcs,
-                                 define_macros=list(macros.items()),
-                                 include_dirs=["Modules/_multiprocessing"]))
+        if sysconfig.get_config_var('WITH_THREAD'):
+            exts.append ( Extension('_multiprocessing', multiprocessing_srcs,
+                                    define_macros=list(macros.items()),
+                                    include_dirs=["Modules/_multiprocessing"]))
+        else:
+            missing.append('_multiprocessing')
         # End multiprocessing
 
         # Platform-specific libraries