[Python-checkins] r82791 - in python/branches/release27-maint: Lib/distutils/util.py Lib/sysconfig.py Misc/NEWS

Sun Jul 11 10:52:52 CEST 2010

Author: ronald.oussoren
Date: Sun Jul 11 10:52:52 2010
New Revision: 82791
Log:
Fix for issue #9164: with this patch sysconfig and distuls don't break
when duplicate '-arch foo' flags end up in CFLAGS (which may happen when
building a universal build using macports)
Modified:
 python/branches/release27-maint/Lib/distutils/util.py
 python/branches/release27-maint/Lib/sysconfig.py
 python/branches/release27-maint/Misc/NEWS
Modified: python/branches/release27-maint/Lib/distutils/util.py
==============================================================================

--- python/branches/release27-maint/Lib/distutils/util.py	(original)
+++ python/branches/release27-maint/Lib/distutils/util.py	Sun Jul 11 10:52:52 2010
@@ -144,8 +144,7 @@
 cflags = get_config_vars().get('CFLAGS')
 
 archs = re.findall('-arch\s+(\S+)', cflags)
- archs.sort()
- archs = tuple(archs)
+ archs = tuple(sorted(set(archs)))
 
 if len(archs) == 1:
 machine = archs[0]
Modified: python/branches/release27-maint/Lib/sysconfig.py
==============================================================================
--- python/branches/release27-maint/Lib/sysconfig.py	(original)
+++ python/branches/release27-maint/Lib/sysconfig.py	Sun Jul 11 10:52:52 2010
@@ -645,8 +645,7 @@
 cflags = get_config_vars().get('CFLAGS')
 
 archs = re.findall('-arch\s+(\S+)', cflags)
- archs.sort()
- archs = tuple(archs)
+ archs = tuple(sorted(set(archs)))
 
 if len(archs) == 1:
 machine = archs[0]
Modified: python/branches/release27-maint/Misc/NEWS
==============================================================================
--- python/branches/release27-maint/Misc/NEWS	(original)
+++ python/branches/release27-maint/Misc/NEWS	Sun Jul 11 10:52:52 2010
@@ -33,6 +33,8 @@
 
 - Issue #9128: Fix validation of class decorators in parser module.
 
+- Issue #9164: Ensure sysconfig handles dupblice archs while building on OSX
+
 Extension Modules
 -----------------
 
