diff options
| author | Joe Hunkeler <jhunkeler@gmail.com> | 2015-10-01 22:40:21 -0400 |
|---|---|---|
| committer | Joe Hunkeler <jhunkeler@gmail.com> | 2015-10-01 22:40:21 -0400 |
| commit | ede6dfcf3833bb5bfd59dbfa479162c62fb6d06a (patch) | |
| tree | b4317bb61fce46e42ed63accd1b7284d84f9fd07 | |
| parent | a336c14ef87bf0ebae76f20112f91e3e2c34c760 (diff) | |
| parent | 97daa8c0b8e9bb79645e2b0d4b65f5c9c49e8f53 (diff) | |
| download | cbc-recipes-ede6dfcf3833bb5bfd59dbfa479162c62fb6d06a.tar.gz | |
Merge branch 'master' of bitbucket.org:jhunkeler/cbc-recipes
| -rw-r--r-- | fftw/fftw.ini | 4 | ||||
| -rw-r--r-- | pyfftw/pyfftw.ini | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/fftw/fftw.ini b/fftw/fftw.ini index fc0542d..f1454a1 100644 --- a/fftw/fftw.ini +++ b/fftw/fftw.ini @@ -12,13 +12,13 @@ fn : ${package:name}-${package:version}.tar.gz url : ${about:home}/${fn} [build] -number : 0 +number : 4 [requirements] build : gcc >=4.6 [osx] run : - #none + pkgconfig [cbc_build] linux : diff --git a/pyfftw/pyfftw.ini b/pyfftw/pyfftw.ini index e9b9838..3139f13 100644 --- a/pyfftw/pyfftw.ini +++ b/pyfftw/pyfftw.ini @@ -13,14 +13,15 @@ fn : pyFFTW-${package:version}.tar.gz url : https://pypi.python.org/packages/source/p/pyFFTW/${fn} [build] -number : 0 +number : 1 [requirements] build : numpy >=1.9 fftw - setuptools - python + cython + setuptools + python run : numpy >=1.9 fftw @@ -28,10 +29,9 @@ run : [cbc_build] linux : - export CFLAGS="`pkg-config --cflags fftw3`" - export LDFLAGS="`pkg-config --libs fftw3`" - python setup.py install || exit 1 - + export CFLAGS="`pkg-config --cflags fftw3`" + export LDFLAGS="`pkg-config --libs fftw3`" + python setup.py install || exit 1 windows : # You're on your own with the libraries, it seems. python setup.py install |