traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
........
This commit is contained in:
Ronald Oussoren 2010-06-27 12:39:22 +00:00
parent c3175fcabf
commit 0bf7ea8568
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Lib/distutils/unixccompiler.py
View File

@ -324,7 +324,9 @@ class UnixCCompiler(CCompiler):
static = os.path.join(dir, static_f) static = os.path.join(dir, static_f)
if sys.platform == 'darwin' and ( 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) shared = os.path.join(sysroot, dir[1:], shared_f)
dylib = os.path.join(sysroot, dir[1:], dylib_f) dylib = os.path.join(sysroot, dir[1:], dylib_f)
static = os.path.join(sysroot, dir[1:], static_f) static = os.path.join(sysroot, dir[1:], static_f)

3
setup.py
View File

@ -44,7 +44,7 @@ def is_macosx_sdk_path(path):
""" """
Returns True if 'path' can be located in an OSX SDK 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): def find_file(filename, std_dirs, paths):
"""Searches for the directory where a given file is located, """Searches for the directory where a given file is located,
@ -937,6 +937,7 @@ class PyBuildExt(build_ext):
else: else:
if os.path.isdir(dn): if os.path.isdir(dn):
tmp.append(dn) tmp.append(dn)
db_dirs_to_check = tmp
# Look for a version specific db-X.Y before an ambiguoius dbX # Look for a version specific db-X.Y before an ambiguoius dbX
# XXX should we -ever- look for a dbX name? Do any # XXX should we -ever- look for a dbX name? Do any