changeset: 74481:8d0ccb4ad206 parent: 74478:12de1ad1cee8 parent: 74480:eed73b16e71f user: Jesus Cea date: Wed Jan 18 04:01:24 2012 +0100 files: Misc/NEWS description: MERGE: Closes #13803: Under Solaris, distutils doesn't include bitness in the directory name diff -r 12de1ad1cee8 -r 8d0ccb4ad206 Lib/distutils/util.py --- a/Lib/distutils/util.py Wed Jan 18 02:05:38 2012 +0100 +++ b/Lib/distutils/util.py Wed Jan 18 04:01:24 2012 +0100 @@ -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 -r 12de1ad1cee8 -r 8d0ccb4ad206 Misc/NEWS --- a/Misc/NEWS Wed Jan 18 02:05:38 2012 +0100 +++ b/Misc/NEWS Wed Jan 18 04:01:24 2012 +0100 @@ -447,6 +447,9 @@ Library ------- +- Issue #13803: Under Solaris, distutils doesn't include bitness + in the directory name. + - Issue #10278: Add time.wallclock() function, monotonic clock. - Issue #13809: Fix regression where bz2 module wouldn't work when threads are