[Python-checkins] cpython (2.7): Closes #13803: Under Solaris, distutils doesn't include bitness in the

[jesus.cea]

http://hg.python.org/cpython/rev/284550d0d8ae
changeset:   74479:284550d0d8ae
branch:      2.7
parent:      74469:51e11b4937b7
user:        Jesus Cea <jcea at jcea.es>
date:        Wed Jan 18 03:51:38 2012 +0100
summary:
  Closes #13803: Under Solaris, distutils doesn't include bitness in the directory name

files:
  Lib/distutils/util.py |  3 ++-
  Misc/NEWS             |  3 +++
  2 files changed, 5 insertions(+), 1 deletions(-)


diff --git a/Lib/distutils/util.py b/Lib/distutils/util.py
--- a/Lib/distutils/util.py
+++ b/Lib/distutils/util.py
@@ -6,7 +6,7 @@
 
 __revision__ = "$Id$"
 
-import sys, os, string, re
+import sys, os, string, re, platform
 from distutils.errors import DistutilsPlatformError
 from distutils.dep_util import newer
 from distutils.spawn import spawn
@@ -76,6 +76,7 @@
         if release[0] >= "5":           # SunOS 5 == Solaris 2
             osname = "solaris"
             release = "%d.%s" % (int(release[0]) - 3, release[2:])
+            machine += ".%s" % platform.architecture()[0]
         # fall through to standard osname-release-machine representation
     elif osname[:4] == "irix":              # could be "irix64"!
         return "%s-%s" % (osname, release)
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -92,6 +92,9 @@
 - Issue #13589: Fix some serialization primitives in the aifc module.
   Patch by Oleg Plakhotnyuk.
 
+- Issue #13803: Under Solaris, distutils doesn't include bitness
+  in the directory name.
+
 - Issue #13642: Unquote before b64encoding user:password during Basic
   Authentication. Patch contributed by Joonas Kuorilehto and Michele Orrù.
 

-- 
Repository URL: http://hg.python.org/cpython