From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Sat, 20 Aug 2011 12:01:05 +0000 (+0200)
Subject: Issue #12326: sys.platform is now always 'linux2' on Linux
X-Git-Tag: v3.2.2~31
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4cf6604b8292b1b61fb2e7f101c4c375052e50c5;p=thirdparty%2FPython%2Fcpython.git

Issue #12326: sys.platform is now always 'linux2' on Linux

Even if Python is compiled on Linux 3.
---

diff --git a/Misc/NEWS b/Misc/NEWS
index fe85823a2d8d..48ef326d56e3 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 508ae3463a1d..9d85e359b1da 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 c4ad4e890872..3e60d8e01654 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";;