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

[Stéphane Gaudreault]

    Date: Sunday, November 20, 2011 @ 21:26:31
  Author: stephane
Revision: 143021

upgpkg: python2 2.7.2-3

gdbm 1.10 rebuild

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

--------------+
 PKGBUILD     |   17 +++++++----------
 linux2.patch |   24 ------------------------
 2 files changed, 7 insertions(+), 34 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-11-21 02:06:36 UTC (rev 143020)
+++ PKGBUILD	2011-11-21 02:26:31 UTC (rev 143021)
@@ -5,7 +5,7 @@
 
 pkgname=python2
 pkgver=2.7.2
-pkgrel=2
+pkgrel=3
 _pybasever=2.7
 pkgdesc="A high-level scripting language"
 arch=('i686' 'x86_64')
@@ -16,10 +16,8 @@
 optdepends=('tk: for IDLE')
 conflicts=('python<3')
 options=('!makeflags')
-source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz
-        linux2.patch)
-sha1sums=('56700044141402dc35e7a0a24aa7ffda1a8c1a53'
-          '8fc817c8da2f74d3ccc93d84a1bc713ed26c00e2')
+source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz)
+sha1sums=('56700044141402dc35e7a0a24aa7ffda1a8c1a53')
 
 build() {
   cd "${srcdir}/Python-${pkgver}"
@@ -34,10 +32,6 @@
   # 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
@@ -48,7 +42,10 @@
   ./configure --prefix=/usr --enable-shared --with-threads --enable-ipv6 \
               --enable-unicode=ucs4 --with-system-expat --with-system-ffi
 
-  make
+  # Make sure sys.platform is set to linux2, even on kernel 3.X
+  # cf http://bugs.python.org/issue12326
+  # Here we simply run make with a different MACHDEP variable. It requires no patching.
+  make MACHDEP=linux2
 }
 
 package() {

Deleted: linux2.patch
===================================================================
--- linux2.patch	2011-11-21 02:06:36 UTC (rev 143020)
+++ linux2.patch	2011-11-21 02:26:31 UTC (rev 143021)
@@ -1,24 +0,0 @@
-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";;
-