mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-15 06:10:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

Merged revisions 74798 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r74798 | ronald.oussoren | 2009-09-15 20:33:33 +0200 (Tue, 15 Sep 2009) | 8 lines

  MacOSX: detect the architectures supported by
  Tk.framework and build _tkinter only for those
  architectures.

  This replaces the hardcoded solution that is no
  longer valid now that 64-bit capable versions of
  Tk are available on OSX.
........
This commit is contained in:
Ronald Oussoren 2009-09-15 18:47:35 +00:00
parent 0d28764d3d
commit c6ddd7f9a7
1 changed files with 10 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

22
setup.py
View file

@ -1501,19 +1501,17 @@ class PyBuildExt(build_ext):
# architectures. # architectures.
cflags = sysconfig.get_config_vars('CFLAGS')[0] cflags = sysconfig.get_config_vars('CFLAGS')[0]
archs = re.findall('-arch\s+(\w+)', cflags) archs = re.findall('-arch\s+(\w+)', cflags)
if 'x86_64' in archs or 'ppc64' in archs: fp = os.popen("file %s/Tk.framework/Tk | grep 'for architecture'"%(F,))
try: detected_archs = []
archs.remove('x86_64') for ln in fp:
except ValueError: a = ln.split()[-1]
pass if a in archs:
try: detected_archs.append(ln.split()[-1])
archs.remove('ppc64') fp.close()
except ValueError:
pass
for a in archs: for a in detected_archs:
frameworks.append('-arch') frameworks.append('-arch')
frameworks.append(a) frameworks.append(a)
ext = Extension('_tkinter', ['_tkinter.c', 'tkappinit.c'], ext = Extension('_tkinter', ['_tkinter.c', 'tkappinit.c'],
define_macros=[('WITH_APPINIT', 1)], define_macros=[('WITH_APPINIT', 1)],