summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@haypocalc.com>2011-08-20 12:01:05 (GMT)
committerVictor Stinner <victor.stinner@haypocalc.com>2011-08-20 12:01:05 (GMT)
commit4cf6604b8292b1b61fb2e7f101c4c375052e50c5 (patch)
tree8587d2b53db24071b9fe1cb6693e7845977c4768
parente1043fc23003426334e2e4f71ca92c8e92c81b98 (diff)
downloadcpython-4cf6604b8292b1b61fb2e7f101c4c375052e50c5.zip
cpython-4cf6604b8292b1b61fb2e7f101c4c375052e50c5.tar.gz
cpython-4cf6604b8292b1b61fb2e7f101c4c375052e50c5.tar.bz2
Issue #12326: sys.platform is now always 'linux2' on Linux
Even if Python is compiled on Linux 3.
-rw-r--r--Misc/NEWS4
-rwxr-xr-xconfigure1
-rw-r--r--configure.in1
3 files changed, 6 insertions, 0 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index fe85823..48ef326 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,10 @@ What's New in Python 3.2.2?
Core and Builtins
-----------------
+- Issue #12326: sys.platform is now always 'linux2' on Linux, even if Python
+ is compiled on Linux 3.
+
+
Library
-------
diff --git a/configure b/configure
index 508ae34..9d85e35 100755
--- a/configure
+++ b/configure
@@ -2997,6 +2997,7 @@ then
MACHDEP="$ac_md_system$ac_md_release"
case $MACHDEP in
+ linux*) MACHDEP="linux2";;
cygwin*) MACHDEP="cygwin";;
darwin*) MACHDEP="darwin";;
irix646) MACHDEP="irix6";;
diff --git a/configure.in b/configure.in
index c4ad4e8..3e60d8e 100644
--- a/configure.in
+++ b/configure.in
@@ -290,6 +290,7 @@ then
MACHDEP="$ac_md_system$ac_md_release"
case $MACHDEP in
+ linux*) MACHDEP="linux2";;
cygwin*) MACHDEP="cygwin";;
darwin*) MACHDEP="darwin";;
irix646) MACHDEP="irix6";;