Merged revisions 82273 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r82273 | ronald.oussoren | 2010-06-27 14:37:46 +0200 (Sun, 27 Jun 2010) | 15 lines

  Merged revisions 82272 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r82272 | ronald.oussoren | 2010-06-27 14:36:16 +0200 (Sun, 27 Jun 2010) | 8 lines

    Two small fixes for the support for SDKs on MacOSX:

    1) The code that checks if an path should be located in the SDK
       explicitly excludes /usr/local. This fixes issue9046

    2) The SDK variant for filtering "db_dirs_to_check" in setup.py
       was not doing anything because of a missing assignment.
  ........
................

diff --git a/Lib/distutils/unixccompiler.py b/Lib/distutils/unixccompiler.py
index f4605f3044727d09f97085fb9ccb65f5536e9193..bf734161544f3b5d6c275c5e086642b22fb2d553 100644 (file)
--- a/Lib/distutils/unixccompiler.py
+++ b/Lib/distutils/unixccompiler.py
@@ -336,7 +336,9 @@ class UnixCCompiler(CCompiler):
             static = os.path.join(dir, static_f)
 
             if sys.platform == 'darwin' and (
-                    dir.startswith('/System/') or dir.startswith('/usr/')):
+                dir.startswith('/System/') or (
+                dir.startswith('/usr/') and not dir.startswith('/usr/local/'))):
+
                 shared = os.path.join(sysroot, dir[1:], shared_f)
                 dylib = os.path.join(sysroot, dir[1:], dylib_f)
                 static = os.path.join(sysroot, dir[1:], static_f)

diff --git a/setup.py b/setup.py
index 880840d90e9145f908902fb11328e6b46b35d6b2..435cb5363c7a166f9a7d39c1d4568fcd83f9ac28 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -43,7 +43,7 @@ def is_macosx_sdk_path(path):
     """
     Returns True if 'path' can be located in an OSX SDK
     """
-    return path.startswith('/usr/') or path.startswith('/System/')
+    return (path.startswith('/usr/') and not path.startswith('/usr/local')) or path.startswith('/System/')
 
 def find_file(filename, std_dirs, paths):
     """Searches for the directory where a given file is located,
@@ -868,6 +868,7 @@ class PyBuildExt(build_ext):
                         else:
                             if os.path.isdir(dn):
                                 tmp.append(dn)
+                    db_dirs_to_check = tmp
 
                     db_dirs_to_check = tmp