From 81b290bf258fd373460efe7be13c0c44c31284e8 Mon Sep 17 00:00:00 2001 From: ocefpaf Date: Mon, 30 May 2016 20:51:54 -0300 Subject: [PATCH 1/4] pin to hdf5 1.8.17* --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 7689721..3396010 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -11,7 +11,7 @@ source: sha256: d435f21b6f74ba42669e390d43a3b6ab401ec3a9420e7fb13d7971a7a71c3c0e build: - number: 1 + number: 2 skip: true # [win] requirements: @@ -21,7 +21,7 @@ requirements: - cmake run: - boost 1.60.* - - hdf5 1.8.15* + - hdf5 1.8.17* - netcdf-cxx4 test: From d26d66c5ec1d7b313c7e2e0d8595e27c20f1d947 Mon Sep 17 00:00:00 2001 From: ocefpaf Date: Tue, 21 Jun 2016 13:06:24 -0300 Subject: [PATCH 2/4] Update pinnings --- recipe/meta.yaml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 3396010..544e97d 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -16,13 +16,12 @@ build: requirements: build: - - boost 1.60.* - - netcdf-cxx4 - cmake + - boost 1.61.* + - netcdf-cxx4 4.3.* run: - - boost 1.60.* - - hdf5 1.8.17* - - netcdf-cxx4 + - boost 1.61.* + - netcdf-cxx4 4.3.* test: commands: From 171919cf4f4ab7a6a3fe96bccc4bc293f48d84ec Mon Sep 17 00:00:00 2001 From: ocefpaf Date: Tue, 21 Jun 2016 16:49:26 -0300 Subject: [PATCH 3/4] Revert boost pin --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 544e97d..6786ec4 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -17,10 +17,10 @@ build: requirements: build: - cmake - - boost 1.61.* + - boost 1.60.* - netcdf-cxx4 4.3.* run: - - boost 1.61.* + - boost 1.60.* - netcdf-cxx4 4.3.* test: @@ -34,7 +34,7 @@ test: about: home: http://meteo-ubonn.github.io/radolan/ license: MIT - summary: C++ library for reading and working with the RADOLAN data format of the German Weather Service (DWD) + summary: C++ library for reading and working with the RADOLAN data format of the German Weather Service (DWD) extra: recipe-maintainers: From 304b974c8b1ae007df2e06636275ca3de7112168 Mon Sep 17 00:00:00 2001 From: ocefpaf Date: Thu, 23 Jun 2016 10:43:47 -0300 Subject: [PATCH 4/4] Fix stdlib libc++ linkage --- .travis.yml | 2 +- recipe/build.sh | 36 ++++++------------------------------ recipe/meta.yaml | 1 + 3 files changed, 8 insertions(+), 31 deletions(-) diff --git a/.travis.yml b/.travis.yml index b090251..c9dbf03 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,7 +26,7 @@ install: conda config --set show_channel_urls true conda update --yes conda - conda install --yes conda-build=1.20.0 jinja2 anaconda-client + conda install --yes conda-build jinja2 anaconda-client conda config --add channels conda-forge diff --git a/recipe/build.sh b/recipe/build.sh index 8e254ad..4591bc2 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -1,38 +1,14 @@ #!/usr/bin/env bash -if [ "$(uname)" == "Darwin" ] -then - # for Mac OSX - export CC=clang - export CXX=clang++ - export MACOSX_VERSION_MIN="10.7" - export MACOSX_DEPLOYMENT_TARGET="${MACOSX_VERSION_MIN}" - export CXXFLAGS="${CXXFLAGS} -mmacosx-version-min=${MACOSX_VERSION_MIN}" - export CXXFLAGS="${CXXFLAGS} -stdlib=libc++ -std=c++11" - export LDFLAGS="${LDFLAGS} -mmacosx-version-min=${MACOSX_VERSION_MIN}" - export LDFLAGS="${LDFLAGS} -stdlib=libc++ -lc++" - export LINKFLAGS="${LDFLAGS}" -elif [ "$(uname)" == "Linux" ] -then - # for Linux - export CC=gcc - export CXX=g++ - export CXXFLAGS="${CXXFLAGS} -DBOOST_MATH_DISABLE_FLOAT128" - export LDFLAGS="${LDFLAGS}" - export LINKFLAGS="${LDFLAGS}" -else - echo "This system is unsupported by the toolchain." - exit 1 +if [ $(uname) == Darwin ]; then + export CXX="${CXX} -stdlib=libc++" fi -export CFLAGS="${CFLAGS} -m${ARCH}" -export CXXFLAGS="${CXXFLAGS} -m${ARCH}" +mkdir build_libradolan && cd build_libradolan +cmake -D CMAKE_INSTALL_PREFIX=$PREFIX \ + -D WITH_TESTS=YES \ + $SRC_DIR -mkdir ../build -cd ../build -cmake $SRC_DIR \ - -DCMAKE_INSTALL_PREFIX=$PREFIX \ - -DWITH_TESTS=YES make VERBOSE=1 make install diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 6786ec4..be8147a 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -19,6 +19,7 @@ requirements: - cmake - boost 1.60.* - netcdf-cxx4 4.3.* + - toolchain run: - boost 1.60.* - netcdf-cxx4 4.3.*