From 286c9d0cd069759d090007da647e78afdb937596 Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Fri, 5 Jan 2018 15:01:53 -0500 Subject: [WIP] Next (#75) * Purge x.x style selectors * Add python jinja2 selectors * Add numpy jinja2 selectors * Add basic build matrix configuration * Delete iraf package; see astroconda/astroconda-iraf * Bump all build revisions * Remove drizzlepac and nose dependencies * Fixup dependencies * Strip newlines in version declaration * Implements new package versioning scheme * Revert sandboxing * Purge old or unnecessary packages * Clean up meta-packages * Use fake version * Minor clean up * Add missing md5 hashes * Python is not a dependency of XPA * Remove GIT_ usage in non-git recipe * Initial commit of asteval * cubeviz: sed patching glue/numpy/pytest * Add missing curly braces * Remove references to pywcs * Add mosviz * Fix up specutils * Forcefully strip all "v" version prefixes. Please stop using them. * Fix ginga * Use PYTHON * Remove d2to1 dep * Remove d2to1 dep * Remove d2to1 dep * Remove d2to1 dep * Remove deprecated JWST pipeline packages * Simplify python builds * Simplify python builds (windows) * Remove d2to1 dep * Remove d2to1 dep * Stop using 2to3 * Remove ATLAS * Move sextractor to mainline * Sextractor Intel MKL integration patches (i.e NO ATLAS) --- fftw/bld.bat | 2 +- fftw/build.sh | 10 +++++----- fftw/meta.yaml | 3 ++- 3 files changed, 8 insertions(+), 7 deletions(-) (limited to 'fftw') diff --git a/fftw/bld.bat b/fftw/bld.bat index 95a6a85..3dd9db3 100644 --- a/fftw/bld.bat +++ b/fftw/bld.bat @@ -1,2 +1,2 @@ -echo Unsupported \ No newline at end of file +echo Unsupported diff --git a/fftw/build.sh b/fftw/build.sh index 3cad563..b89c0c2 100644 --- a/fftw/build.sh +++ b/fftw/build.sh @@ -1,14 +1,14 @@ - +set -e export modes="--enable-single --enable-long-double" export FFTW_CONFIGURE="./configure --prefix=$PREFIX --disable-static --enable-shared --enable-threads " 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 -for mode in $modes; do fftw_build $mode; done \ No newline at end of file +for mode in $modes; do fftw_build $mode; done diff --git a/fftw/meta.yaml b/fftw/meta.yaml index ce33a57..94ca4a5 100644 --- a/fftw/meta.yaml +++ b/fftw/meta.yaml @@ -1,6 +1,6 @@ {% set name = 'fftw' %} {% set version = '3.3.4' %} -{% set number = '0' %} +{% set number = '1' %} about: home: http://www.fftw.org @@ -24,3 +24,4 @@ requirements: source: fn: {{ name }}-{{ version }}.tar.gz url: http://www.fftw.org/{{ name }}-{{ version }}.tar.gz + md5: 2edab8c06b24feeb3b82bbb3ebf3e7b3 -- cgit