summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@haypocalc.com>2011-08-20 12:02:38 (GMT)
committerVictor Stinner <victor.stinner@haypocalc.com>2011-08-20 12:02:38 (GMT)
commitacacbaa788efe190217f81836a7bcd81224dbaac (patch)
tree1b4701c2e54adba54ee579947902fe94d3b67840
parenta7eb3c802e9ff40c6ff6a1f7c7f86097eccd01ab (diff)
downloadcpython-acacbaa788efe190217f81836a7bcd81224dbaac.zip
cpython-acacbaa788efe190217f81836a7bcd81224dbaac.tar.gz
cpython-acacbaa788efe190217f81836a7bcd81224dbaac.tar.bz2
Issue #12326: sys.platform is now always 'linux2' on Linux
Even if Python is compiled on Linux 3.
-rw-r--r--Misc/NEWS3
-rwxr-xr-xconfigure1
-rw-r--r--configure.in1
3 files changed, 5 insertions, 0 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 78f4fa6..331ac4e 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -40,6 +40,9 @@ Core and Builtins
Library
-------
+- Issue #12326: sys.platform is now always 'linux2' on Linux, even if Python
+ is compiled on Linux 3.
+
- Issue #9173: Let shutil._make_archive work if the logger argument is None.
- Issue #12650: Fix a race condition where a subprocess.Popen could leak
diff --git a/configure b/configure
index 3af5eeb..99a7c71 100755
--- a/configure
+++ b/configure
@@ -2995,6 +2995,7 @@ then
MACHDEP="$ac_md_system$ac_md_release"
case $MACHDEP in
+ linux*) MACHDEP="linux2";;
cygwin*) MACHDEP="cygwin";;
darwin*) MACHDEP="darwin";;
atheos*) MACHDEP="atheos";;
diff --git a/configure.in b/configure.in
index 139b21b..acd35d8 100644
--- a/configure.in
+++ b/configure.in
@@ -293,6 +293,7 @@ then
MACHDEP="$ac_md_system$ac_md_release"
case $MACHDEP in
+ linux*) MACHDEP="linux2";;
cygwin*) MACHDEP="cygwin";;
darwin*) MACHDEP="darwin";;
atheos*) MACHDEP="atheos";;