Skip to content

Commit

Permalink
Merged revisions 81662 via svnmerge from
Browse files Browse the repository at this point in the history 
svn+ssh://[email protected]/python/trunk

........
  r81662 | ronald.oussoren | 2010-06-03 11:47:21 +0200 (Thu, 03 Jun 2010) | 9 lines

  Fix for issue python#7724: ensure that distutils and python's own setup.py
  honor the MacOSX SDK when one is specified.

  This is needed to be able to build using the 10.4u SDK while running
  on OSX 10.6.

  This is a fixed version of the patch in r80963, I've tested this patch
  on OSX and Linux.
........
  • Loading branch information
@ronaldoussoren
ronaldoussoren committed Jun 3, 2010
1 parent 1b51272 commit 2c12ab1
Show file tree
Hide file tree
Showing 2 changed files with 128 additions and 21 deletions.
23 changes: 22 additions & 1 deletion Lib/distutils/unixccompiler.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

__revision__ = "$Id$"

import os, sys
import os, sys, re

from distutils.dep_util import newer
from distutils.ccompiler import \
Expand Down Expand Up @@ -320,10 +320,31 @@ def find_library_file(self, dirs, lib, debug=0):
dylib_f = self.library_filename(lib, lib_type='dylib')
static_f = self.library_filename(lib, lib_type='static')

if sys.platform == 'darwin':
# On OSX users can specify an alternate SDK using
# '-isysroot', calculate the SDK root if it is specified
# (and use it further on)
_sysconfig = __import__('sysconfig')
cflags = _sysconfig.get_config_var('CFLAGS')
m = re.search(r'-isysroot\s+(\S+)', cflags)
if m is None:
sysroot = '/'
else:
sysroot = m.group(1)



for dir in dirs:
shared = os.path.join(dir, shared_f)
dylib = os.path.join(dir, dylib_f)
static = os.path.join(dir, static_f)

if sys.platform == 'darwin' and (
dir.startswith('/System/') or dir.startswith('/usr/')):
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)

# We're second-guessing the linker here, with not much hard
# data to go on: GCC seems to prefer the shared library, so I'm
# assuming that *all* Unix C compilers do. And of course I'm
Expand Down
126 changes: 106 additions & 20 deletions setup.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,25 @@ def add_dir_to_list(dirlist, dir):
if dir is not None and os.path.isdir(dir) and dir not in dirlist:
dirlist.insert(0, dir)

def macosx_sdk_root():
"""
Return the directory of the current OSX SDK,
or '/' if no SDK was specified.
"""
cflags = sysconfig.get_config_var('CFLAGS')
m = re.search(r'-isysroot\s+(\S+)', cflags)
if m is None:
sysroot = '/'
else:
sysroot = m.group(1)
return sysroot

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/')

def find_file(filename, std_dirs, paths):
"""Searches for the directory where a given file is located,
and returns a possibly-empty list of additional directories, or None
Expand All @@ -39,15 +58,28 @@ def find_file(filename, std_dirs, paths):
'paths' is a list of additional locations to check; if the file is
found in one of them, the resulting list will contain the directory.
"""
if sys.platform == 'darwin':
# Honor the MacOSX SDK setting when one was specified.
# An SDK is a directory with the same structure as a real
# system, but with only header files and libraries.
sysroot = macosx_sdk_root()

# Check the standard locations
for dir in std_dirs:
f = os.path.join(dir, filename)

if sys.platform == 'darwin' and is_macosx_sdk_path(dir):
f = os.path.join(sysroot, dir[1:], filename)

if os.path.exists(f): return []

# Check the additional directories
for dir in paths:
f = os.path.join(dir, filename)

if sys.platform == 'darwin' and is_macosx_sdk_path(dir):
f = os.path.join(sysroot, dir[1:], filename)

if os.path.exists(f):
return [dir]

Expand All @@ -59,11 +91,19 @@ def find_library_file(compiler, libname, std_dirs, paths):
if result is None:
return None

if sys.platform == 'darwin':
sysroot = macosx_sdk_root()

# Check whether the found file is in one of the standard directories
dirname = os.path.dirname(result)
for p in std_dirs:
# Ensure path doesn't end with path separator
p = p.rstrip(os.sep)

if sys.platform == 'darwin' and is_macosx_sdk_path(p):
if os.path.join(sysroot, p[1:]) == dirname:
return [ ]

if p == dirname:
return [ ]

Expand All @@ -72,6 +112,11 @@ def find_library_file(compiler, libname, std_dirs, paths):
for p in paths:
# Ensure path doesn't end with path separator
p = p.rstrip(os.sep)

if sys.platform == 'darwin' and is_macosx_sdk_path(p):
if os.path.join(sysroot, p[1:]) == dirname:
return [ p ]

if p == dirname:
return [p]
else:
Expand Down Expand Up @@ -497,7 +542,7 @@ def detect_modules(self):
# library and then a static library, instead of first looking
# for dynamic libraries on the entire path.
# This way a staticly linked custom readline gets picked up
# before the (broken) dynamic library in /usr/lib.
# before the (possibly broken) dynamic library in /usr/lib.
readline_extra_link_args = ('-Wl,-search_paths_first',)
else:
readline_extra_link_args = ()
Expand Down Expand Up @@ -571,22 +616,23 @@ def detect_modules(self):
openssl_ver = 0
openssl_ver_re = re.compile(
'^\s*#\s*define\s+OPENSSL_VERSION_NUMBER\s+(0x[0-9a-fA-F]+)' )
for ssl_inc_dir in inc_dirs + search_for_ssl_incs_in:
name = os.path.join(ssl_inc_dir, 'openssl', 'opensslv.h')
if os.path.isfile(name):
try:
incfile = open(name, 'r')
for line in incfile:
m = openssl_ver_re.match(line)
if m:
openssl_ver = eval(m.group(1))
break
except IOError:
pass

# first version found is what we'll use (as the compiler should)
if openssl_ver:
break
# look for the openssl version header on the compiler search path.
opensslv_h = find_file('openssl/opensslv.h', [],
inc_dirs + search_for_ssl_incs_in)
if opensslv_h:
name = os.path.join(opensslv_h[0], 'openssl/opensslv.h')
if sys.platform == 'darwin' and is_macosx_sdk_path(name):
name = os.path.join(macosx_sdk_root(), name[1:])
try:
incfile = open(name, 'r')
for line in incfile:
m = openssl_ver_re.match(line)
if m:
openssl_ver = eval(m.group(1))
except IOError as msg:
print("IOError while reading opensshv.h:", msg)
pass

#print('openssl_ver = 0x%08x' % openssl_ver)
min_openssl_ver = 0x00907000
Expand Down Expand Up @@ -715,12 +761,18 @@ def gen_db_minor_ver_nums(major):

db_ver_inc_map = {}

if sys.platform == 'darwin':
sysroot = macosx_sdk_root()

class db_found(Exception): pass
try:
# See whether there is a Sleepycat header in the standard
# search path.
for d in inc_dirs + db_inc_paths:
f = os.path.join(d, "db.h")
if sys.platform == 'darwin' and is_macosx_sdk_path(d):
f = os.path.join(sysroot, d[1:], "db.h")

if db_setup_debug: print("db: looking for db.h in", f)
if os.path.exists(f):
f = open(f, "rb").read()
Expand Down Expand Up @@ -767,7 +819,22 @@ class db_found(Exception): pass
db_incdir.replace("include", 'lib64'),
db_incdir.replace("include", 'lib'),
]
db_dirs_to_check = list(filter(os.path.isdir, db_dirs_to_check))

if sys.platform != 'darwin':
db_dirs_to_check = list(filter(os.path.isdir, db_dirs_to_check))

else:
# Same as other branch, but takes OSX SDK into account
tmp = []
for dn in db_dirs_to_check:
if is_macosx_sdk_path(dn):
if os.path.isdir(os.path.join(sysroot, dn[1:])):
tmp.append(dn)
else:
if os.path.isdir(dn):
tmp.append(dn)

db_dirs_to_check = tmp

# Look for a version specific db-X.Y before an ambiguoius dbX
# XXX should we -ever- look for a dbX name? Do any
Expand Down Expand Up @@ -816,8 +883,15 @@ class db_found(Exception): pass
# Scan the default include directories before the SQLite specific
# ones. This allows one to override the copy of sqlite on OSX,
# where /usr/include contains an old version of sqlite.
if sys.platform == 'darwin':
sysroot = macosx_sdk_root()

for d in inc_dirs + sqlite_inc_paths:
f = os.path.join(d, "sqlite3.h")

if sys.platform == 'darwin' and is_macosx_sdk_path(d):
f = os.path.join(sysroot, d[1:], "sqlite3.h")

if os.path.exists(f):
if sqlite_setup_debug: print("sqlite: found %s"%f)
incf = open(f).read()
Expand Down Expand Up @@ -1253,14 +1327,22 @@ def detect_tkinter_darwin(self, inc_dirs, lib_dirs):
join(os.getenv('HOME'), '/Library/Frameworks')
]

sysroot = macosx_sdk_root()

# Find the directory that contains the Tcl.framework and Tk.framework
# bundles.
# XXX distutils should support -F!
for F in framework_dirs:
# both Tcl.framework and Tk.framework should be present


for fw in 'Tcl', 'Tk':
if not exists(join(F, fw + '.framework')):
break
if is_macosx_sdk_path(F):
if not exists(join(sysroot, F[1:], fw + '.framework')):
break
else:
if not exists(join(F, fw + '.framework')):
break
else:
# ok, F is now directory with both frameworks. Continure
# building
Expand Down Expand Up @@ -1297,8 +1379,12 @@ def detect_tkinter_darwin(self, inc_dirs, lib_dirs):

# Note: cannot use os.popen or subprocess here, that
# requires extensions that are not available here.
os.system("file %s/Tk.framework/Tk | grep 'for architecture' > %s"%(F, tmpfile))
if is_macosx_sdk_path(F):
os.system("file %s/Tk.framework/Tk | grep 'for architecture' > %s"%(os.path.join(sysroot, F[1:]), tmpfile))
else:
os.system("file %s/Tk.framework/Tk | grep 'for architecture' > %s"%(F, tmpfile))
fp = open(tmpfile)

detected_archs = []
for ln in fp:
a = ln.split()[-1]
Expand Down

0 comments on commit 2c12ab1

Please sign in to comment.