diff options
Diffstat (limited to 'community/python-scipy')
| -rw-r--r-- | community/python-scipy/0001-FIX-define-macro-to-access-C99-extensions-from-C.patch | 43 | ||||
| -rwxr-xr-x | community/python-scipy/PKGBUILD | 103 | ||||
| -rw-r--r-- | community/python-scipy/python-scipy.changelog (renamed from community/python-scipy/ChangeLog) | 17 |
3 files changed, 90 insertions, 73 deletions
diff --git a/community/python-scipy/0001-FIX-define-macro-to-access-C99-extensions-from-C.patch b/community/python-scipy/0001-FIX-define-macro-to-access-C99-extensions-from-C.patch deleted file mode 100644 index c58a943b5..000000000 --- a/community/python-scipy/0001-FIX-define-macro-to-access-C99-extensions-from-C.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 8ed781828b1d8e1692105c0c0c130858d47a28ce Mon Sep 17 00:00:00 2001 -From: Fabian Pedregosa <fabian.pedregosa@inria.fr> -Date: Sun, 25 Jul 2010 14:35:35 +0200 -Subject: [PATCH] FIX: define macro to access C99 extensions from C++. - -This prevented scipy.sparse.sparsetools to compile correctly under -python2.7, because the wrappers are C++ files but ndarraytypes.h -references some C99 macros in inttypes.h. ---- - scipy/sparse/sparsetools/SConscript | 1 + - scipy/sparse/sparsetools/setup.py | 4 +++- - 2 files changed, 4 insertions(+), 1 deletions(-) - -diff --git a/scipy/sparse/sparsetools/SConscript b/scipy/sparse/sparsetools/SConscript -index 1aa5557..85d9e05 100644 ---- a/scipy/sparse/sparsetools/SConscript -+++ b/scipy/sparse/sparsetools/SConscript -@@ -3,6 +3,7 @@ - from numscons import GetNumpyEnvironment - - env = GetNumpyEnvironment(ARGUMENTS) -+env.PrependUnique(CPPDEFINES = '__STDC_FORMAT_MACROS') - - for fmt in ['csr','csc','coo','bsr','dia']: - sources = [ fmt + '_wrap.cxx' ] -diff --git a/scipy/sparse/sparsetools/setup.py b/scipy/sparse/sparsetools/setup.py -index f4027a7..c4c4636 100755 ---- a/scipy/sparse/sparsetools/setup.py -+++ b/scipy/sparse/sparsetools/setup.py -@@ -9,7 +9,9 @@ def configuration(parent_package='',top_path=None): - for fmt in ['csr','csc','coo','bsr','dia']: - sources = [ fmt + '_wrap.cxx' ] - depends = [ fmt + '.h' ] -- config.add_extension('_' + fmt, sources=sources, depends=depends) -+ config.add_extension('_' + fmt, sources=sources, -+ define_macros=[('__STDC_FORMAT_MACROS', 1)], -+ depends=depends) - - return config - --- -1.7.1.1 - diff --git a/community/python-scipy/PKGBUILD b/community/python-scipy/PKGBUILD index 771194b20..f726054ca 100755 --- a/community/python-scipy/PKGBUILD +++ b/community/python-scipy/PKGBUILD @@ -1,40 +1,85 @@ -#$Id: PKGBUILD 27301 2010-09-19 16:29:18Z schuay $ +# $Id: PKGBUILD 45545 2011-04-24 06:08:32Z schiv $ # Maintainer: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> -# Maintainer: Douglas Soares de Andrade <dsa@aur.archlinux.org> +# Maintainer: Ray Rashif <schiv@archlinux.org> +# Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org> +# Contributor: Bodor Dávid Gábor <david.gabor.bodor@gmail.com> +# Contributor: Andrzej Giniewicz <gginiu@gmail.com> -pkgname=python-scipy -pkgver=0.8.0 -pkgrel=4 -pkgdesc="SciPy (pronounced 'Sigh Pie') is open-source software for mathematics, science, and engineering." +pkgbase=python-scipy +_app=scipy +pkgname=('python-scipy' 'python2-scipy') +pkgver=0.9.0 +_theapp=$_app-$pkgver +pkgrel=1 +pkgdesc="SciPy is open-source software for mathematics, science, and engineering." arch=('i686' 'x86_64' 'mips64el') -url="http://www.scipy.org" +url="http://www.scipy.org/" license=('BSD') -depends=('lapack' 'blas' 'python2' 'python-numpy') -makedepends=('gcc' 'gcc-fortran') -conflicts=('scipy' 'scipy_core') -source=("http://downloads.sourceforge.net/scipy/scipy-${pkgver}.tar.gz" - '0001-FIX-define-macro-to-access-C99-extensions-from-C.patch') -md5sums=('f0bfc6141b90e6a31555b31486602251' - '609759549d0571fc04d52c89b16258ed') +depends=('python3-numpy') +makedepends=('gcc-fortran' 'python2-numpy') +changelog=$pkgbase.changelog +source=("http://downloads.sourceforge.net/$_app/$_theapp.tar.gz") +md5sums=('ebfef6e8e82d15c875a4ee6a46d4e1cd') build() { - unset LDFLAGS - unset FFLAGS + cd "$srcdir" - cd ${srcdir}/scipy-${pkgver} - #Changing the arithmetic parameter (Thanks to Fabrizio Castellano) - sed -i "s/\#define\ UNK\ 1/\#define\ IBMPC\ 1/" $srcdir/scipy-$pkgver/scipy/special/cephes/mconf.h + unset LDFLAGS + unset FFLAGS - # fix build with python 2.7 (see http://projects.scipy.org/scipy/ticket/1180) - patch -p1 < ${srcdir}/0001-FIX-define-macro-to-access-C99-extensions-from-C.patch + # Compatibility symlinks for current stable numpy + # - no need to patch numpy just for this + # see http://projects.scipy.org/numpy/ticket/1749 + ln -sf /usr/lib/liblapack.so liblapack.cpython-32mu.so + ln -sf /usr/lib/libblas.so libblas.cpython-32mu.so + export LAPACK="$srcdir" + export BLAS="$srcdir" - # python2 fix - for file in $(find . -name '*.py' -print); do - sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' $file - sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file - done + # Changing the arithmetic parameter (Thanks to Fabrizio Castellano) + sed -i "s/\#define\ UNK\ 1/\#define\ IBMPC\ 1/" \ + $_theapp/$_app/special/cephes/mconf.h - python2 setup.py config_fc --fcompiler=gnu95 build - python2 setup.py config_fc --fcompiler=gnu95 install --prefix=/usr --root=${pkgdir} - install -D -m644 LICENSE.txt ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.txt + # 2 builds + cp -r $_theapp $_theapp-py2 + + # build for python3 + cd $_theapp + python setup.py config_fc --fcompiler=gnu95 build + + # build for python2 + cd ../$_theapp-py2 + + for file in $(find . -name '*.py' -print); do + sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' $file + sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file + done + + python2 setup.py config_fc --fcompiler=gnu95 build } + +package_python-scipy() { + provides=('python3-scipy' 'scipy') + + cd "$srcdir/$_theapp" + + python setup.py config_fc --fcompiler=gnu95 install \ + --prefix=/usr --root="$pkgdir" --optimize=1 + + install -Dm644 LICENSE.txt \ + "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +package_python2-scipy() { + depends=('python2-numpy') + conflicts=('python-scipy<0.9.0') + + cd "$srcdir/$_theapp-py2" + + python2 setup.py config_fc --fcompiler=gnu95 install \ + --prefix=/usr --root="$pkgdir" --optimize=1 + + install -Dm644 LICENSE.txt \ + "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +# vim:set ts=2 sw=2 et: diff --git a/community/python-scipy/ChangeLog b/community/python-scipy/python-scipy.changelog index 00071d2a7..77c6d43a5 100644 --- a/community/python-scipy/ChangeLog +++ b/community/python-scipy/python-scipy.changelog @@ -1,3 +1,18 @@ +2011-04-24 Ray Rashif <schiv@archlinux.org> + + * 0.9.0-1: + Couldn't release previous update due to lapack/blas issues + See http://mailman.archlinux.org/pipermail/arch-general/2011-April/019677.html + Hopefully symlink trick from AUR/python3-scipy fixes that + +2011-04-05 Ray Rashif <schiv@archlinux.org> + + * 0.9.0-1: + Upstream release + SciPy now supports Python 3 + Package split for python(3), python2 + PKGBUILD cleanup + 2010-07-29 Angel 'angvp' Velasquez <angvp@archlinux.org> * Updated to: 0.8.0 2009-08-05 Douglas Soares de Andrade <douglas@archlinux.org> @@ -23,7 +38,7 @@ 2007-10-29 Douglas Soares de Andrade <dsa@aur.archlinux.org> - * Changed email + * Changed email * Fixed some problems in the PKGBUILD * Updated to new release - 0.6.0 |