From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 30 Jan 2010 20:00:35 +0000 (+0000)
Subject: Merged revisions 68874 via svnmerge from
X-Git-Tag: v2.6.5rc1~114
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e68892ddf46eeed05b52c874b6cbaf32a023f402;p=thirdparty%2FPython%2Fcpython.git

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

diff --git a/Misc/NEWS b/Misc/NEWS
index 73267a8e2eaf..050595dbe182 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -775,6 +775,10 @@ Library
 
 - 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.
 
diff --git a/setup.py b/setup.py
index d0826ce41c50..f9ef3e3839e9 100644
--- a/setup.py
+++ b/setup.py
@@ -1325,9 +1325,13 @@ 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=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