diff --git a/recipe/build.sh b/recipe/build.sh index 96109ce..0e9ead5 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -1,21 +1,23 @@ #!/bin/bash -if [[ $(uname) == Darwin ]]; then - export LIBRARY_SEARCH_VAR=DYLD_FALLBACK_LIBRARY_PATH -elif [[ $(uname) == Linux ]]; then - export LIBRARY_SEARCH_VAR=LD_LIBRARY_PATH +if [[ $(uname) == 'Darwin' ]]; then + OPTS="--disable-openmp" +elif [[ $(uname) == 'Linux' ]]; then + export CFLAGS="-fPIC -fopenmp $CFLAGS" + OPTS="--with-jasper=$PREFIX --with-libxml2=$PREFIX --with-curl=$PREFIX --with-proj=$PREFIX --with-fftw3 --with-grib_api=$PREFIX --with-udunits2=$PREFIX --with-netcdf=$PREFIX --with-hdf5=$PREFIX" fi -export CPPFLAGS=-I$PREFIX/include -export LDFLAGS=-L$PREFIX/lib +export LDFLAGS="-L$PREFIX/lib $LDFLAGS" +export CPPFLAGS="-I$PREFIX/include $CPPFLAGS" + ./configure --prefix=$PREFIX \ --disable-debug \ --disable-dependency-tracking \ - --with-jasper=$PREFIX \ - --with-hdf5=$PREFIX \ - --with-netcdf=$PREFIX \ - --with-proj=$PREFIX + $OPTS make -eval ${LIBRARY_SEARCH_VAR}=$PREFIX/lib make check +# See https://github.com/conda-forge/cdo-feedstock/pull/8#issuecomment-257273909 +# Hopefully https://github.com/conda-forge/hdf5-feedstock/pull/48 will fix this. +# eval ${LIBRARY_SEARCH_VAR}=$PREFIX/lib make check +make check CDO="${SRC_DIR}/src/cdo -L" make install diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 851109e..6c805f4 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "1.7.1" %} +{% set version = "1.7.2" %} package: name: cdo @@ -6,11 +6,11 @@ package: source: fn: cdo-{{ version }}.tar.gz - url: https://code.zmaw.de/attachments/download/12070/cdo-{{ version }}.tar.gz - sha256: 5c24a5cb74dcf6e8b5140c67033868a5a0b641341e3adad3cb4035d5ad6e70a6 + url: https://code.zmaw.de/attachments/download/12760/cdo-{{ version }}.tar.gz + sha256: 4c43eba7a95f77457bfe0d30fb82382b3b5f2b0cf90aca6f0f0a008f6cc7e697 build: - number: 6 + number: 0 skip: True # [win] requirements: @@ -19,12 +19,20 @@ requirements: - libnetcdf 4.4.* - proj4 4.9.3 - util-linux # [linux] + - ecmwf_grib + - udunits2 + - libxml2 + - fftw run: - jasper - libnetcdf 4.4.* - proj4 4.9.3 - libgcc # [linux] - util-linux # [linux] + - ecmwf_grib + - udunits2 + - libxml2 + - fftw test: commands: