diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-07-18 12:59:47 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-07-18 12:59:47 -0300 |
| commit | 12c074375919d2de177eb9456352866902118a03 (patch) | |
| tree | 3f6b2e5baadedbc7901bf3e614fd017ca8aaee52 /extra/python | |
| parent | 598db82f25ffe3557e395a11f379de65af9e1ac1 (diff) | |
| parent | ddddf9c453076a407bfdbf3e030e606f31ee2b86 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/dopewars/PKGBUILD
community/virtualbox/PKGBUILD
core/lvm2/PKGBUILD
extra/aspell/PKGBUILD
extra/gnome-python-extras/PKGBUILD
extra/libproxy/PKGBUILD
extra/live-media/PKGBUILD
extra/ocaml/PKGBUILD
extra/putty/PKGBUILD
extra/python/PKGBUILD
extra/ruby/PKGBUILD
kde-unstable/calligra/PKGBUILD
multilib-testing/lib32-mesa/PKGBUILD
testing/mesa/PKGBUILD
Diffstat (limited to 'extra/python')
| -rw-r--r-- | extra/python/PKGBUILD | 39 |
1 files changed, 26 insertions, 13 deletions
diff --git a/extra/python/PKGBUILD b/extra/python/PKGBUILD index 478a2dfcb..948c3f4eb 100644 --- a/extra/python/PKGBUILD +++ b/extra/python/PKGBUILD @@ -1,39 +1,41 @@ -# $Id: PKGBUILD 119805 2011-04-15 11:51:39Z stephane $ +# $Id: PKGBUILD 131166 2011-07-11 13:06:25Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Maintainer: Allan McRae <allan@archlinux.org> -# Contributer: Jason Chu <jason@archlinux.org> +# Contributor: Jason Chu <jason@archlinux.org> pkgname=python -pkgver=3.2 -pkgrel=2 +pkgver=3.2.1 +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') +optdepends=('tk: for tkinter' 'sqlite3') provides=('python3') replaces=('python3') options=('!makeflags') -source=(http://www.python.org/ftp/python/${_pybasever}/Python-${pkgver}.tar.xz - CVE-2011-1521.patch) -sha1sums=('55a3a9d39f31563370d0c494373bb6d38e4d1a00' - '561161ce5ae3a91254352c09a33e3e4434444e14') +source=(http://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz) +sha1sums=('ab5cf4a4c21abe590dea87473a1dee6820699d79') + build() { cd "${srcdir}/Python-${pkgver}" + # FS#23997 + sed -i -e "s|^#.* /usr/local/bin/python|#!/usr/bin/python|" Lib/cgi.py + # 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 rm -r Modules/zlib rm -r Modules/_ctypes/{darwin,libffi}* - # urllib Security Vulnerability - # http://blog.python.org/2011/04/urllib-security-vulnerability-fixed.html - patch -Np1 -i ../CVE-2011-1521.patch + if [ "$CARCH" = "mips64el" ]; then ./configure --prefix=/usr \ --enable-shared \ --with-threads \ @@ -43,6 +45,17 @@ build() { --with-wide-unicode \ --with-system-expat \ --with-system-ffi + else + ./configure --prefix=/usr \ + --enable-shared \ + --with-threads \ + --with-computed-gotos \ + --enable-ipv6 \ + --with-valgrind \ + --with-wide-unicode \ + --with-system-expat \ + --with-system-ffi + fi make } @@ -69,7 +82,7 @@ package() { "${pkgdir}/usr/lib/python${_pybasever}/config-${_pybasever}mu/libpython${_pybasever}mu.so" # Clean-up reference to build directory - sed -i "s#$srcdir/Python-${pkgver}:##" "$pkgdir/usr/lib/python${_pybasever}/config-${_pybasever}mu/Makefile" + sed -i "s|$srcdir/Python-${pkgver}:||" "$pkgdir/usr/lib/python${_pybasever}/config-${_pybasever}mu/Makefile" # License install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" |