[arch-commits] Commit in python2/trunk (PKGBUILD linux2.patch)

[Stéphane Gaudreault]

    Date: Friday, September 16, 2011 @ 12:35:58
  Author: stephane
Revision: 138106

Make sure sys.platform is set to linux2, even on kernel 3.X

Added:
  python2/trunk/linux2.patch
Modified:
  python2/trunk/PKGBUILD

--------------+
 PKGBUILD     |   10 ++++++++--
 linux2.patch |   24 ++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-09-16 14:11:53 UTC (rev 138105)
+++ PKGBUILD	2011-09-16 16:35:58 UTC (rev 138106)
@@ -16,8 +16,10 @@
 optdepends=('tk: for IDLE')
 conflicts=('python<3')
 options=('!makeflags')
-source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz)
-sha1sums=('56700044141402dc35e7a0a24aa7ffda1a8c1a53')
+source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz
+        linux2.patch)
+sha1sums=('56700044141402dc35e7a0a24aa7ffda1a8c1a53'
+          '8fc817c8da2f74d3ccc93d84a1bc713ed26c00e2')
 
 build() {
   cd "${srcdir}/Python-${pkgver}"
@@ -32,6 +34,10 @@
   # FS#23997
   sed -i -e "s|^#.* /usr/local/bin/python|#!/usr/bin/python2|" Lib/cgi.py
 
+  # Make sure sys.platform is set to linux2, even on kernel 3.X
+  # cf http://bugs.python.org/issue12326
+  patch -Np1 -i ../linux2.patch
+
   # Ensure that we are using the system copy of various libraries (expat, zlib and libffi),
   # rather than copies shipped in the tarball
   rm -r Modules/expat

Added: linux2.patch
===================================================================
--- linux2.patch	                        (rev 0)
+++ linux2.patch	2011-09-16 16:35:58 UTC (rev 138106)
@@ -0,0 +1,24 @@
+http://hg.python.org/cpython/rev/c816479f6aaf/
+diff --git a/configure b/configure
+--- 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
+--- 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";;
+