From 000f9fe943522e54fcfd0910711bfdbde8785e3b Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Wed, 14 Feb 2018 16:04:22 -0500 Subject: Next (#292) * Strip x.x selectors * Assign build-time python lock * Minimal build matrix * Numpy locking * Force -m64 on darwin * ds9: add md5 hash * stsci: Remove build section * Replace python calls with env variable; Strip redundant exit conditions * Remove dead packages * sextractor: Use Intel MKL * Use autotools whatever the platform; Switch URL to github mirror (astromatic is too slow) * Force linkage against Intel OpenMP Signed-off-by: Joseph Hunkeler * Add version guard template * Remove dead sextractor package * Bump all build revisions * Remove recipes that exist in defaults or no longer serve a purpose * Fixup mosviz requirements * Remove purge_path usage * Remove glue* recipes (favor defaults channel) * Remove pydrizzle * Replace glueviz requirement with glue-core * Remove pytools * Remove pytools dependency * Adjust specviz requirements * pyregion moved to astropy org * Fix d2to1 dependency * Remove d2to1 pip calls * Remove deprecated stsci_sphinx_theme --- fftw/build.sh | 6 +++--- fftw/meta.yaml | 5 ++++- 2 files changed, 7 insertions(+), 4 deletions(-) (limited to 'fftw') 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 -- cgit