[Python-checkins] r82275 - in python/branches/release31-maint: Lib/distutils/unixccompiler.py setup.py

[ronald.oussoren]

Author: ronald.oussoren
Date: Sun Jun 27 14:40:35 2010
New Revision: 82275

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


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Lib/distutils/unixccompiler.py
   python/branches/release31-maint/setup.py

Modified: python/branches/release31-maint/Lib/distutils/unixccompiler.py
==============================================================================
--- python/branches/release31-maint/Lib/distutils/unixccompiler.py	(original)
+++ python/branches/release31-maint/Lib/distutils/unixccompiler.py	Sun Jun 27 14:40:35 2010
@@ -336,7 +336,9 @@
             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)

Modified: python/branches/release31-maint/setup.py
==============================================================================
--- python/branches/release31-maint/setup.py	(original)
+++ python/branches/release31-maint/setup.py	Sun Jun 27 14:40:35 2010
@@ -43,7 +43,7 @@
     """
     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 @@
                         else:
                             if os.path.isdir(dn):
                                 tmp.append(dn)
+                    db_dirs_to_check = tmp
 
                     db_dirs_to_check = tmp