From 7e7dbab08a85937cd6a81acfc57dfff3b42dfbb6 Mon Sep 17 00:00:00 2001 From: Ronald Oussoren Date: Wed, 20 Oct 2010 13:40:38 +0000 Subject: Merged revisions 85744 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r85744 | ronald.oussoren | 2010-10-20 15:10:12 +0200 (Wed, 20 Oct 2010) | 7 lines Fix for issue #7473. Without this patch you'll get link errors in some extensions (in particular the _curses_panel) one when you try to build a 3-way universal framework when you previously installed a 2-way universal framework using the python.org installer. ........ --- Misc/NEWS | 3 +++ setup.py | 7 ++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Misc/NEWS b/Misc/NEWS index ac86186..9797b91 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -659,6 +659,9 @@ Build the "bin" directory inside the framework is on the shell's search path. This feature now also supports the ZSH shell. +- Issue #7473: avoid link errors when building a framework with a different + set of architectures than the one that is currently installed. + Tests ----- - Issue #9628: fix runtests.sh -x option so more than one test can be excluded. diff --git a/setup.py b/setup.py index cdb1937..2eb4b85 100644 --- a/setup.py +++ b/setup.py @@ -378,7 +378,12 @@ class PyBuildExt(build_ext): for directory in reversed(options.dirs): add_dir_to_list(dir_list, directory) - if os.path.normpath(sys.prefix) != '/usr': + if os.path.normpath(sys.prefix) != '/usr' \ + and not sysconfig.get_config_var('PYTHONFRAMEWORK'): + # OSX note: Don't add LIBDIR and INCLUDEDIR to building a framework + # (PYTHONFRAMEWORK is set) to avoid # linking problems when + # building a framework with different architectures than + # the one that is currently installed (issue #7473) add_dir_to_list(self.compiler.library_dirs, sysconfig.get_config_var("LIBDIR")) add_dir_to_list(self.compiler.include_dirs, -- cgit v0.12