[Python-checkins] cpython (merge 3.2 -> default): merge

[ned.deily]

http://hg.python.org/cpython/rev/70e47b8cc485
changeset:   74739:70e47b8cc485
parent:      74736:55bbcbc48683
parent:      74738:6f6100a752ba
user:        Ned Deily <nad at acm.org>
date:        Fri Feb 03 02:45:05 2012 +0100
summary:
  merge

files:
  Lib/distutils/tests/support.py |  10 ++++++++--
  Misc/NEWS                      |   2 ++
  2 files changed, 10 insertions(+), 2 deletions(-)


diff --git a/Lib/distutils/tests/support.py b/Lib/distutils/tests/support.py
--- a/Lib/distutils/tests/support.py
+++ b/Lib/distutils/tests/support.py
@@ -188,6 +188,9 @@
         cmd = build_ext(dist)
         support.fixup_build_ext(cmd)
         cmd.ensure_finalized()
+
+    Unlike most other Unix platforms, Mac OS X embeds absolute paths
+    to shared libraries into executables, so the fixup is not needed there.
     """
     if os.name == 'nt':
         cmd.debug = sys.executable.endswith('_d.exe')
@@ -199,5 +202,8 @@
         if runshared is None:
             cmd.library_dirs = ['.']
         else:
-            name, equals, value = runshared.partition('=')
-            cmd.library_dirs = value.split(os.pathsep)
+            if sys.platform == 'darwin':
+                cmd.library_dirs = []
+            else:
+                name, equals, value = runshared.partition('=')
+                cmd.library_dirs = value.split(os.pathsep)
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -463,6 +463,8 @@
 Library
 -------
 
+- Issue #13901: Prevent test_distutils failures on OS X with --enable-shared.
+
 - Issue #13676: Handle strings with embedded zeros correctly in sqlite3.
 
 - Issue #13506: Add '' to path for IDLE Shell when started and restarted with Restart Shell.

-- 
Repository URL: http://hg.python.org/cpython