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

[jesus.cea]

http://hg.python.org/cpython/rev/eed73b16e71f
changeset:   74480:eed73b16e71f
branch:      3.2
parent:      74471:eb47af6e9e22
user:        Jesus Cea <jcea at jcea.es>
date:        Wed Jan 18 03:58:42 2012 +0100
summary:
  Closes #13803: Under Solaris, distutils doesn't include bitness in the directory name

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


diff --git a/Lib/distutils/util.py b/Lib/distutils/util.py
--- a/Lib/distutils/util.py
+++ b/Lib/distutils/util.py
@@ -9,6 +9,7 @@
 import imp
 import sys
 import string
+import platform
 from distutils.errors import DistutilsPlatformError
 from distutils.dep_util import newer
 from distutils.spawn import spawn
@@ -77,6 +78,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
@@ -100,6 +100,9 @@
 Library
 -------
 
+- Issue #13803: Under Solaris, distutils doesn't include bitness
+  in the directory name.
+
 - Issue #13589: Fix some serialization primitives in the aifc module.
   Patch by Oleg Plakhotnyuk.
 

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