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 a62b485fc21f10eb11ccbd188e0ceaf421440161..a4251e35fbfa4fde6c74c00f9822af83a5ac713d 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -16,6 +16,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #12326: sys.platform is now always 'linux2' on Linux, even if Python
+  is compiled on Linux 3.
+
 - Issue #12650: Fix a race condition where a subprocess.Popen could leak
   resources (FD/zombie) when killed at the wrong time.
 

diff --git a/configure b/configure
index 508ae3463a1da9a7a8dc7756fbedb92b583ea152..9d85e359b1da0245492ee391232deb38eeff32ac 100755 (executable)
--- 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 c4ad4e8908721c1c9bd6fc04e2fa43ef725084b1..3e60d8e01654421475f0d928c29e38965b31d681 100644 (file)
--- 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";;