diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-20 15:39:19 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-20 15:39:19 +0200 |
| commit | f201c0c97570e91af0fcec400d827a3f1bba79cc (patch) | |
| tree | 6b87f10653f54a3b7294d3f2028704e323849781 /extra/python | |
| parent | f97d206e9152e1d29ad8fb9f2ea2aee95f1da625 (diff) | |
| parent | 947c2e7bbbd5942492024997d34d709d436f1c8f (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
extra/python/PKGBUILD
multilib-testing/gcc-multilib/PKGBUILD
testing/colord/PKGBUILD
testing/epiphany/PKGBUILD
testing/fcitx/PKGBUILD
testing/folks/PKGBUILD
testing/gcalctool/PKGBUILD
testing/gcc/PKGBUILD
testing/gnome-games/PKGBUILD
testing/gnome-shell/PKGBUILD
testing/mutter/PKGBUILD
testing/yelp/PKGBUILD
Diffstat (limited to 'extra/python')
| -rw-r--r-- | extra/python/PKGBUILD | 47 |
1 files changed, 16 insertions, 31 deletions
diff --git a/extra/python/PKGBUILD b/extra/python/PKGBUILD index 0588647ac..93db5fc80 100644 --- a/extra/python/PKGBUILD +++ b/extra/python/PKGBUILD @@ -1,29 +1,25 @@ -# $Id: PKGBUILD 143818 2011-11-29 13:33:44Z stephane $ +# $Id: PKGBUILD 156459 2012-04-18 12:20:59Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> -# Maintainer: Allan McRae <allan@archlinux.org> +# Contributor: Allan McRae <allan@archlinux.org> # Contributor: Jason Chu <jason@archlinux.org> pkgname=python -pkgver=3.2.2 -pkgrel=2 -pkgrel=1 #holdver +pkgver=3.2.3 +pkgrel=1 _pybasever=3.2 pkgdesc="Next generation of the python high-level scripting language" arch=('i686' 'x86_64' 'mips64el') license=('custom') url="http://www.python.org/" depends=('expat' 'bzip2' 'gdbm' 'openssl' 'libffi' 'zlib') -makedepends=('tk' 'sqlite3' 'valgrind') -[ "$CARCH" = "mips64el" ] && \ -makedepends=('tk' 'sqlite3') -optdepends=('tk: for tkinter' 'sqlite3') +makedepends=('tk' 'sqlite') +[ "$CARCH" != "mips64el" ] && makedepends+=('valgrind') +optdepends=('tk: for tkinter' 'sqlite') provides=('python3') replaces=('python3') options=('!makeflags') -source=(http://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz - gdbm-magic-values.patch) -sha1sums=('5e654dbd48476193ccdef4d604ed4f45b48c6769' - '43bfbe3e23360f412b95cb284ff29b2cbe338be9') +source=(http://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz) +sha1sums=('3d607dbcfdf100dd659978195ccf3ade9d221823') build() { cd "${srcdir}/Python-${pkgver}" @@ -31,10 +27,6 @@ build() { # FS#23997 sed -i -e "s|^#.* /usr/local/bin/python|#!/usr/bin/python|" Lib/cgi.py - # gdbm has new magic that whichdb does not recognize - # http://bugs.python.org/issue13007 - patch -Np1 -i ../gdbm-magic-values.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 @@ -43,28 +35,20 @@ build() { if [ "$CARCH" = "mips64el" ]; then - ./configure --prefix=/usr \ - --enable-shared \ - --with-threads \ - --with-computed-gotos \ - --enable-ipv6 \ - --without-valgrind \ - --with-wide-unicode \ - --with-system-expat \ - --with-dbmliborder=gdbm:ndbm \ - --with-system-ffi + extraconf=--with-valgrind else + extraconf="" + fi ./configure --prefix=/usr \ --enable-shared \ --with-threads \ --with-computed-gotos \ --enable-ipv6 \ - --with-valgrind \ --with-wide-unicode \ --with-system-expat \ --with-dbmliborder=gdbm:ndbm \ - --with-system-ffi - fi + --with-system-ffi \ + $extraconf make } @@ -72,7 +56,8 @@ build() { check() { cd "${srcdir}/Python-${pkgver}" LD_LIBRARY_PATH="${srcdir}/Python-${pkgver}":${LD_LIBRARY_PATH} \ - "${srcdir}/Python-${pkgver}/python" -m test.regrtest -x test_distutils test_site test_uuid + "${srcdir}/Python-${pkgver}/python" -m test.regrtest -x test_distutils test_site \ + test_urllib test_uuid test_pydoc } package() { |