diff options
| author | Matt Rendina <rendinam@users.noreply.github.com> | 2018-02-22 08:53:06 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-22 08:53:06 -0500 |
| commit | d4ccb57a335dfda4b3583107767a081691352b2f (patch) | |
| tree | 43dd1892560bcc467c5eaf1373390cefe4707acd /fftw | |
| parent | ebe4788bd2ee01f8b991f02d1665db3d87cc383d (diff) | |
| parent | e027b0e371ddedc4377b43b425d2f67282ff45b7 (diff) | |
| download | astroconda-contrib-d4ccb57a335dfda4b3583107767a081691352b2f.tar.gz | |
Merge branch 'master' into patch-3
Diffstat (limited to 'fftw')
| -rw-r--r-- | fftw/build.sh | 6 | ||||
| -rw-r--r-- | fftw/meta.yaml | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/fftw/build.sh b/fftw/build.sh index 3cad563..e52d574 100644 --- a/fftw/build.sh +++ b/fftw/build.sh @@ -4,9 +4,9 @@ export FFTW_CONFIGURE="./configure --prefix=$PREFIX --disable-static --enable-sh function fftw_build { -$FFTW_CONFIGURE "$@" || exit 1 -make -j$CPU_COUNT || exit 1 -make install || exit 1 +$FFTW_CONFIGURE "$@" +make -j$CPU_COUNT +make install } fftw_build diff --git a/fftw/meta.yaml b/fftw/meta.yaml index 4a614ad..537d2c4 100644 --- a/fftw/meta.yaml +++ b/fftw/meta.yaml @@ -1,6 +1,9 @@ {% set name = 'fftw' %} {% set version = '3.3.4' %} -{% set number = '0' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '1' %} about: home: http://www.fftw.org |