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.
diff --git a/Misc/NEWS b/Misc/NEWS
index ccab30a..16dad49 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -141,6 +141,9 @@
- Accept Oracle Berkeley DB 5.0 and 5.1 as backend for the dbm extension.
+- Issue #7473: avoid link errors when building a framework with a different
+ set of architectures than the one that is currently installed.
+
What's New in Python 3.2 Alpha 3?
=================================
diff --git a/setup.py b/setup.py
index 549eccb..3cdcea1 100644
--- a/setup.py
+++ b/setup.py
@@ -400,7 +400,12 @@
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,