Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

MERGE: Closes #13803: Under Solaris, distutils doesn't include bitness in the directory name

This commit is contained in:
Jesus Cea 2012-01-18 04:01:24 +01:00
parent e39ebe45c4 8874fd6bb0
commit 44acda4c97
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lib/distutils/util.py
View File

@ -9,6 +9,7 @@ import re
import imp import imp
import sys import sys
import string import string
import platform
from distutils.errors import DistutilsPlatformError from distutils.errors import DistutilsPlatformError
from distutils.dep_util import newer from distutils.dep_util import newer
from distutils.spawn import spawn from distutils.spawn import spawn
@ -77,6 +78,7 @@ def get_platform ():
if release[0] >= "5": # SunOS 5 == Solaris 2 if release[0] >= "5": # SunOS 5 == Solaris 2
osname = "solaris" osname = "solaris"
release = "%d.%s" % (int(release[0]) - 3, release[2:]) release = "%d.%s" % (int(release[0]) - 3, release[2:])
machine += ".%s" % platform.architecture()[0]
# fall through to standard osname-release-machine representation # fall through to standard osname-release-machine representation
elif osname[:4] == "irix": # could be "irix64"! elif osname[:4] == "irix": # could be "irix64"!
return "%s-%s" % (osname, release) return "%s-%s" % (osname, release)

3
Misc/NEWS
View File

@ -447,6 +447,9 @@ Core and Builtins
Library Library
------- -------
- Issue #13803: Under Solaris, distutils doesn't include bitness
in the directory name.
- Issue #10278: Add time.wallclock() function, monotonic clock. - Issue #10278: Add time.wallclock() function, monotonic clock.
- Issue #13809: Fix regression where bz2 module wouldn't work when threads are - Issue #13809: Fix regression where bz2 module wouldn't work when threads are