[arch-commits] Commit in python/trunk (PKGBUILD python-internal-expat.patch)

[Stéphane Gaudreault]

    Date: Monday, November 29, 2010 @ 18:26:44
  Author: stephane
Revision: 101643

upgpkg: python 3.1.3-1
upstream update, use system libraries, run testsuite

Modified:
  python/trunk/PKGBUILD
  python/trunk/python-internal-expat.patch

-----------------------------+
 PKGBUILD                    |   39 +++++++++++++++++++++++++++++----------
 python-internal-expat.patch |   14 +++++++-------
 2 files changed, 36 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-11-29 23:20:37 UTC (rev 101642)
+++ PKGBUILD	2010-11-29 23:26:44 UTC (rev 101643)
@@ -3,14 +3,14 @@
 # Contributer: Jason Chu <jason at archlinux.org>
 
 pkgname=python
-pkgver=3.1.2
-pkgrel=2
+pkgver=3.1.3
+pkgrel=1
 _pybasever=3.1
 pkgdesc="Next generation of the python high-level scripting language"
 arch=('i686' 'x86_64')
 license=('custom')
 url="http://www.python.org"
-depends=('expat' 'bzip2' 'gdbm' 'openssl' 'zlib')
+depends=('expat' 'bzip2' 'gdbm' 'openssl' 'libffi' 'zlib')
 makedepends=('tk' 'sqlite3')
 optdepends=('tk: for tkinter')
 provides=('python3')
@@ -18,23 +18,42 @@
 options=('!makeflags')
 source=(http://www.python.org/ftp/python/${pkgver}/Python-${pkgver}.tar.bz2
         python-internal-expat.patch)
-md5sums=('45350b51b58a46b029fb06c61257e350'
-         '993800dbcc0c4f199c1ceee998a06e71')
+md5sums=('ad5e5f1c07e829321e0a015f8cafe245'
+         '57fa26dd3353a697e8262d926aa035ad')
 
 build() {
-  cd ${srcdir}/Python-${pkgver}
+  cd "${srcdir}/Python-${pkgver}"
 
-  patch -Np0 -i ${srcdir}/python-internal-expat.patch
+  # Ensure that we are using the system copy of various libraries (expat, zlib and libffi),
+  # rather than copies shipped in the tarball
+  patch -Np0 -i ../python-internal-expat.patch
+  rm -r Modules/expat
+  rm -r Modules/zlib
+  rm -r Modules/_ctypes/{darwin,libffi}*
 
   export OPT="${CFLAGS}"
-  ./configure --prefix=/usr --enable-shared --with-threads --with-computed-gotos \
-              --enable-unicode --with-wide-unicode
+  export export CPPFLAGS="`pkg-config --cflags-only-I libffi`"
+  ./configure --prefix=/usr \
+              --enable-shared \
+              --with-threads \
+              --with-computed-gotos \
+              --enable-ipv6 \
+              --with-wide-unicode \
+              --with-system-ffi
 
   make
+
+  # Run the upstream test suite
+  LD_LIBRARY_PATH=${srcdir}/Python-${pkgver}:build/lib.linux-x86_64-${_pybasever} PYTHON=./python \
+     ./runtests.sh -x test_distutils
+  for TESTNAME in $(cat BAD); do
+     echo "== $TESTNAME =="
+     cat OUT/$TESTNAME.out
+  done
 }
 
 package() {
-  cd ${srcdir}/Python-${pkgver}
+  cd "${srcdir}/Python-${pkgver}"
   make DESTDIR=${pkgdir} install
 
   # why are these not done by default...

Modified: python-internal-expat.patch
===================================================================
--- python-internal-expat.patch	2010-11-29 23:20:37 UTC (rev 101642)
+++ python-internal-expat.patch	2010-11-29 23:26:44 UTC (rev 101643)
@@ -1,6 +1,6 @@
---- setup.py    2008-04-22 12:12:24.613554757 +0300
-+++ setup.py    2008-04-22 12:13:09.276544063 +0300
-@@ -1035,18 +1035,15 @@
+--- setup.py	2010-11-26 06:56:26.000000000 -0500
++++ setup.py	2010-11-29 07:51:25.000000031 -0500
+@@ -1227,18 +1227,15 @@
          #
          # More information on Expat can be found at www.libexpat.org.
          #
@@ -11,7 +11,7 @@
 +        # Use system expat
 +        expatinc = '/usr/include'
 +        define_macros = []
-
+ 
          exts.append(Extension('pyexpat',
                                define_macros = define_macros,
                                include_dirs = [expatinc],
@@ -22,12 +22,12 @@
 -                                         'expat/xmltok.c',
                                           ],
                                ))
-
-@@ -1058,6 +1055,7 @@
+ 
+@@ -1250,6 +1247,7 @@
              exts.append(Extension('_elementtree',
                                    define_macros = define_macros,
                                    include_dirs = [expatinc],
 +                                  libraries = ['expat'],
                                    sources = ['_elementtree.c'],
                                    ))
-
+         else: