[Python-checkins] r82797 - in python/branches/release26-maint: Lib/distutils/util.py Misc/NEWS

[ronald.oussoren]

Author: ronald.oussoren
Date: Sun Jul 11 11:08:11 2010
New Revision: 82797

Log:
Merged revisions 82791 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/release27-maint

........
  r82791 | ronald.oussoren | 2010-07-11 10:52:52 +0200 (Sun, 11 Jul 2010) | 4 lines
  
  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/release26-maint/   (props changed)
   python/branches/release26-maint/Lib/distutils/util.py
   python/branches/release26-maint/Misc/NEWS

Modified: python/branches/release26-maint/Lib/distutils/util.py
==============================================================================
--- python/branches/release26-maint/Lib/distutils/util.py	(original)
+++ python/branches/release26-maint/Lib/distutils/util.py	Sun Jul 11 11:08:11 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/release26-maint/Misc/NEWS
==============================================================================
--- python/branches/release26-maint/Misc/NEWS	(original)
+++ python/branches/release26-maint/Misc/NEWS	Sun Jul 11 11:08:11 2010
@@ -81,6 +81,8 @@
 Library
 -------
 
+- Issue #9164: Ensure sysconfig handles dupblice archs while building on OSX
+
 - Issue #7646: The fnmatch pattern cache no longer grows without bound.
 
 - Issue #9136: Fix 'dictionary changed size during iteration'