From d991d9fc237af9f1292e1628791b6d8e9ea8d94e Mon Sep 17 00:00:00 2001 From: Denis Nadeau Date: Wed, 1 Feb 2017 18:39:19 -0800 Subject: [PATCH 01/19] build libcf --- recipes/libcf/build.sh | 15 +++++++++++ recipes/libcf/meta.yaml | 56 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+) create mode 100644 recipes/libcf/build.sh create mode 100644 recipes/libcf/meta.yaml diff --git a/recipes/libcf/build.sh b/recipes/libcf/build.sh new file mode 100644 index 0000000000000..1c0e5b6f3535e --- /dev/null +++ b/recipes/libcf/build.sh @@ -0,0 +1,15 @@ +export CFLAGS="-Wall -g -m64 -pipe -O2 -fPIC" +export CXXLAGS="${CFLAGS}" +export CPPFLAGS="-I${PREFIX}/include" +export LDFLAGS="-L${PREFIX}/lib" +export LFLAGS="-fPIC" + +CONDA_LST=`conda list` +if [[ ${CONDA_LST}'y' == *'openmpi'* ]]; then + export CC=mpicc + export CXX=mpicxx + export LC_RPATH="${PREFIX}/lib" + export DYLD_FALLBACK_LIBRARY_PATH=${PREFIX}/lib +fi +./configure --prefix=${PREFIX} +${PYTHON} setup.py install diff --git a/recipes/libcf/meta.yaml b/recipes/libcf/meta.yaml new file mode 100644 index 0000000000000..5bc8c19dc154f --- /dev/null +++ b/recipes/libcf/meta.yaml @@ -0,0 +1,56 @@ +package: +{% set name = "libcf" %} +{% set version = "1.0" %} + +package: + name: {{ name|lower }} + version: {{ version }} + +source: + fn: {{ name }}-{{ version }}-beta11.tar.gz + url: http://uvcdat.llnl.gov/cdat/resources/{{ name }}-{{ version }}-beta11.tar.gz + sha256: e40d3826ca2b47538b075f69f716798e255fe396fd3ae68e8b051be57a951bb4 + +build: + number: 0 + skip: True # [win] + +requirements: + build: + - hdf5 + - libnetcdf 4.3.3.1 + - lapack >=3.4.2 + - clapack >=3.2.1 + - curl + - python + - ossuuid + run: + - python + - hdf5 + - libnetcdf 4.3.3.1 + - lapack >=3.4.2 + - clapack >=3.2.1 + - curl + - ossuuid + +test: + imports: + - pycf + +about: + home: http://www.unidata.ucar.edu/software/libcf/ + license: 'UCAR/UNIDATA' + license_file: 'COPYRIGHT' + summary: 'LibCF library access data files in accordance with the CF Conventions.' + description: | + By using libcf, a data producer can produce files that conform to the CF + standards, without having to write netCDF code to create and decode all + the attributes that the CF convention uses to store meta-data. A data consumer + can use libcf to read any file which conforms to the CF conventions; the + file does not need to be created with libcf to be read by libcf + dev_url: https://sourceforge.net/projects/libcf/ + +extra: + recipe-maintainers: + - dnadeau4 + - doutriaux1 From 3f20dcb506419e696ac91db0b3ef9f8f1b6008b1 Mon Sep 17 00:00:00 2001 From: Denis Nadeau Date: Mon, 6 Feb 2017 14:37:56 -0800 Subject: [PATCH 02/19] fix skip windows and py3k section --- recipes/libcf/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/libcf/meta.yaml b/recipes/libcf/meta.yaml index 5bc8c19dc154f..3d31994ecfb23 100644 --- a/recipes/libcf/meta.yaml +++ b/recipes/libcf/meta.yaml @@ -13,7 +13,7 @@ source: build: number: 0 - skip: True # [win] + skip: True # [win or py3k] requirements: build: From b11987c2f8d028149f8422eb4a9b4d3683388b68 Mon Sep 17 00:00:00 2001 From: Denis Nadeau Date: Tue, 7 Feb 2017 17:43:22 -0800 Subject: [PATCH 03/19] retrigger --- recipes/libcf/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/libcf/meta.yaml b/recipes/libcf/meta.yaml index 3d31994ecfb23..b84d18b440cad 100644 --- a/recipes/libcf/meta.yaml +++ b/recipes/libcf/meta.yaml @@ -1,4 +1,4 @@ -package: + {% set name = "libcf" %} {% set version = "1.0" %} From 7c7a79d7b721428b4e23498a4172fbeb2aca4896 Mon Sep 17 00:00:00 2001 From: Denis Nadeau Date: Tue, 7 Feb 2017 17:50:12 -0800 Subject: [PATCH 04/19] add gcc --- recipes/libcf/meta.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes/libcf/meta.yaml b/recipes/libcf/meta.yaml index b84d18b440cad..ab53cab7b48d1 100644 --- a/recipes/libcf/meta.yaml +++ b/recipes/libcf/meta.yaml @@ -24,6 +24,7 @@ requirements: - curl - python - ossuuid + - gcc run: - python - hdf5 @@ -32,6 +33,7 @@ requirements: - clapack >=3.2.1 - curl - ossuuid + - libgcc test: imports: From ff3ea0d85be5a1441a27f1b19a7696404ddf3244 Mon Sep 17 00:00:00 2001 From: Denis Nadeau Date: Tue, 7 Feb 2017 17:50:41 -0800 Subject: [PATCH 05/19] delete space --- recipes/libcf/meta.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/recipes/libcf/meta.yaml b/recipes/libcf/meta.yaml index ab53cab7b48d1..3185090447348 100644 --- a/recipes/libcf/meta.yaml +++ b/recipes/libcf/meta.yaml @@ -1,4 +1,3 @@ - {% set name = "libcf" %} {% set version = "1.0" %} From e25a6400ee55d76f5d6a9f75673ce6ef017d8db6 Mon Sep 17 00:00:00 2001 From: Denis Nadeau Date: Fri, 10 Feb 2017 13:11:44 -0800 Subject: [PATCH 06/19] Fix Build and pinning libnetcdf [skip appveyor] --- recipes/libcf/build.sh | 10 +++++----- recipes/libcf/meta.yaml | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/recipes/libcf/build.sh b/recipes/libcf/build.sh index 1c0e5b6f3535e..8c484ade2ddc7 100644 --- a/recipes/libcf/build.sh +++ b/recipes/libcf/build.sh @@ -1,8 +1,8 @@ -export CFLAGS="-Wall -g -m64 -pipe -O2 -fPIC" -export CXXLAGS="${CFLAGS}" -export CPPFLAGS="-I${PREFIX}/include" -export LDFLAGS="-L${PREFIX}/lib" -export LFLAGS="-fPIC" +export CFLAGS="-Wall -g -m64 -pipe -O2 -fPIC ${CFLAGS}" +export CXXLAGS="${CFLAGS} ${CXXLAGS}" +export CPPFLAGS="-I${PREFIX}/include ${CPPFLAGS}" +export LDFLAGS="-L${PREFIX}/lib ${LDFLAGS}" +export LFLAGS="-fPIC ${LFLAGS}" CONDA_LST=`conda list` if [[ ${CONDA_LST}'y' == *'openmpi'* ]]; then diff --git a/recipes/libcf/meta.yaml b/recipes/libcf/meta.yaml index 3185090447348..1d958a57d9dc0 100644 --- a/recipes/libcf/meta.yaml +++ b/recipes/libcf/meta.yaml @@ -17,7 +17,7 @@ build: requirements: build: - hdf5 - - libnetcdf 4.3.3.1 + - libnetcdf - lapack >=3.4.2 - clapack >=3.2.1 - curl @@ -27,7 +27,7 @@ requirements: run: - python - hdf5 - - libnetcdf 4.3.3.1 + - libnetcdf - lapack >=3.4.2 - clapack >=3.2.1 - curl From 3e2334282efce5718b5f34a87098ae541b04299e Mon Sep 17 00:00:00 2001 From: Denis Nadeau Date: Sun, 12 Feb 2017 17:00:41 -0800 Subject: [PATCH 07/19] add libgfortran --- recipes/libcf/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/libcf/meta.yaml b/recipes/libcf/meta.yaml index 1d958a57d9dc0..bd258a0297ec1 100644 --- a/recipes/libcf/meta.yaml +++ b/recipes/libcf/meta.yaml @@ -33,6 +33,7 @@ requirements: - curl - ossuuid - libgcc + - libgfortran test: imports: From baca045bf15d4af7e70044c32114cbcd2b0116cc Mon Sep 17 00:00:00 2001 From: Denis Nadeau Date: Sun, 12 Feb 2017 18:03:37 -0800 Subject: [PATCH 08/19] reset number to 0 and remove libgfortran --- recipes/libcf/meta.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/recipes/libcf/meta.yaml b/recipes/libcf/meta.yaml index bd258a0297ec1..5cc3d00ec5c50 100644 --- a/recipes/libcf/meta.yaml +++ b/recipes/libcf/meta.yaml @@ -11,7 +11,7 @@ source: sha256: e40d3826ca2b47538b075f69f716798e255fe396fd3ae68e8b051be57a951bb4 build: - number: 0 + number: 1 skip: True # [win or py3k] requirements: @@ -33,7 +33,6 @@ requirements: - curl - ossuuid - libgcc - - libgfortran test: imports: From 48836763ca757cae10b10f64b57d6c84f6c37c9e Mon Sep 17 00:00:00 2001 From: Denis Nadeau Date: Tue, 14 Feb 2017 13:55:04 -0800 Subject: [PATCH 09/19] cat config.log to see what is going on --- recipes/libcf/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/libcf/build.sh b/recipes/libcf/build.sh index 8c484ade2ddc7..ef89019d5a0a7 100644 --- a/recipes/libcf/build.sh +++ b/recipes/libcf/build.sh @@ -12,4 +12,5 @@ if [[ ${CONDA_LST}'y' == *'openmpi'* ]]; then export DYLD_FALLBACK_LIBRARY_PATH=${PREFIX}/lib fi ./configure --prefix=${PREFIX} +cat config.log ${PYTHON} setup.py install From 84664dcfd93640880b75c73c9c4e17c69caad78b Mon Sep 17 00:00:00 2001 From: Denis Date: Tue, 14 Feb 2017 23:29:46 -0800 Subject: [PATCH 10/19] Deploy for MAC OSX --- recipes/libcf/build.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/recipes/libcf/build.sh b/recipes/libcf/build.sh index ef89019d5a0a7..34e282e475318 100644 --- a/recipes/libcf/build.sh +++ b/recipes/libcf/build.sh @@ -4,6 +4,11 @@ export CPPFLAGS="-I${PREFIX}/include ${CPPFLAGS}" export LDFLAGS="-L${PREFIX}/lib ${LDFLAGS}" export LFLAGS="-fPIC ${LFLAGS}" +if [ "$(uname)" == "Darwin" ]; then + export CXXFLAGS="$CXXFLAGS -fno-common" + export MACOSX_DEPLOYMENT_TARGET=$(sw_vers -productVersion | sed -E "s/([0-9]+\.[0-9]+).*/\1/") +fi + CONDA_LST=`conda list` if [[ ${CONDA_LST}'y' == *'openmpi'* ]]; then export CC=mpicc @@ -12,5 +17,4 @@ if [[ ${CONDA_LST}'y' == *'openmpi'* ]]; then export DYLD_FALLBACK_LIBRARY_PATH=${PREFIX}/lib fi ./configure --prefix=${PREFIX} -cat config.log ${PYTHON} setup.py install From 6b58dc980e2a3a82d527754105fca4694e365221 Mon Sep 17 00:00:00 2001 From: Denis Date: Wed, 15 Feb 2017 00:09:45 -0800 Subject: [PATCH 11/19] Try more env variables --- recipes/libcf/build.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/recipes/libcf/build.sh b/recipes/libcf/build.sh index 34e282e475318..5bdcf3dde73fb 100644 --- a/recipes/libcf/build.sh +++ b/recipes/libcf/build.sh @@ -5,8 +5,11 @@ export LDFLAGS="-L${PREFIX}/lib ${LDFLAGS}" export LFLAGS="-fPIC ${LFLAGS}" if [ "$(uname)" == "Darwin" ]; then - export CXXFLAGS="$CXXFLAGS -fno-common" + export CXXFLAGS="${CXXFLAGS} -fno-common" export MACOSX_DEPLOYMENT_TARGET=$(sw_vers -productVersion | sed -E "s/([0-9]+\.[0-9]+).*/\1/") + export DYLD_FALLBACK_LIBRARY_PATH=${PREFIX}/lib + export LDFLAGS="${LDFLAGS} -lpython" + fi CONDA_LST=`conda list` From 8279229cc782a6e4e694ea4d5eeb82720108e050 Mon Sep 17 00:00:00 2001 From: Denis Date: Wed, 15 Feb 2017 00:14:36 -0800 Subject: [PATCH 12/19] try again --- recipes/libcf/build.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/recipes/libcf/build.sh b/recipes/libcf/build.sh index 5bdcf3dde73fb..06c6974641f8e 100644 --- a/recipes/libcf/build.sh +++ b/recipes/libcf/build.sh @@ -9,7 +9,6 @@ if [ "$(uname)" == "Darwin" ]; then export MACOSX_DEPLOYMENT_TARGET=$(sw_vers -productVersion | sed -E "s/([0-9]+\.[0-9]+).*/\1/") export DYLD_FALLBACK_LIBRARY_PATH=${PREFIX}/lib export LDFLAGS="${LDFLAGS} -lpython" - fi CONDA_LST=`conda list` From 7766d4668f769e5e7fa700a709b033f6f0b28e7a Mon Sep 17 00:00:00 2001 From: Denis Nadeau Date: Wed, 15 Feb 2017 09:55:17 -0800 Subject: [PATCH 13/19] Change python library Path to rpath --- recipes/libcf/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/libcf/build.sh b/recipes/libcf/build.sh index 06c6974641f8e..bfa4312d442a3 100644 --- a/recipes/libcf/build.sh +++ b/recipes/libcf/build.sh @@ -20,3 +20,4 @@ if [[ ${CONDA_LST}'y' == *'openmpi'* ]]; then fi ./configure --prefix=${PREFIX} ${PYTHON} setup.py install +if [ `uname` == Darwin ]; then install_name_tool -change /System/Library/Frameworks/Python.framework/Versions/2.7/Python @rpath/libpython2.7.dylib ${SP_DIR}/*.so ; fi From 0e2ff2f041ebe4c2dd0df9c66834d0cecb605354 Mon Sep 17 00:00:00 2001 From: Denis Date: Wed, 15 Feb 2017 23:19:29 -0800 Subject: [PATCH 14/19] change SP_DIR/libcf --- recipes/libcf/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/libcf/build.sh b/recipes/libcf/build.sh index bfa4312d442a3..c745e137b481b 100644 --- a/recipes/libcf/build.sh +++ b/recipes/libcf/build.sh @@ -20,4 +20,4 @@ if [[ ${CONDA_LST}'y' == *'openmpi'* ]]; then fi ./configure --prefix=${PREFIX} ${PYTHON} setup.py install -if [ `uname` == Darwin ]; then install_name_tool -change /System/Library/Frameworks/Python.framework/Versions/2.7/Python @rpath/libpython2.7.dylib ${SP_DIR}/*.so ; fi +if [ `uname` == Darwin ]; then install_name_tool -change /System/Library/Frameworks/Python.framework/Versions/2.7/Python @rpath/libpython2.7.dylib ${SP_DIR}/libcf/*.so ; fi From 34ec668eacd565ae95337f77ca83be8f780890fa Mon Sep 17 00:00:00 2001 From: Denis Nadeau Date: Thu, 16 Feb 2017 10:43:15 -0800 Subject: [PATCH 15/19] change wrong directory libcf to pycf --- recipes/libcf/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/libcf/build.sh b/recipes/libcf/build.sh index c745e137b481b..3c26f8a8d7113 100644 --- a/recipes/libcf/build.sh +++ b/recipes/libcf/build.sh @@ -20,4 +20,4 @@ if [[ ${CONDA_LST}'y' == *'openmpi'* ]]; then fi ./configure --prefix=${PREFIX} ${PYTHON} setup.py install -if [ `uname` == Darwin ]; then install_name_tool -change /System/Library/Frameworks/Python.framework/Versions/2.7/Python @rpath/libpython2.7.dylib ${SP_DIR}/libcf/*.so ; fi +if [ `uname` == Darwin ]; then install_name_tool -change /System/Library/Frameworks/Python.framework/Versions/2.7/Python @rpath/libpython2.7.dylib ${SP_DIR}/pycf/*.so ; fi From 9b6b3c8873ee9faf1c4cce770d97ab4d5c2a3188 Mon Sep 17 00:00:00 2001 From: Denis Nadeau Date: Fri, 17 Feb 2017 16:27:09 -0800 Subject: [PATCH 16/19] Add activate/deactivate like in toolchain example --- recipes/libcf/activate.sh | 54 +++++++++++++++++++++++++++++++++++++ recipes/libcf/build.sh | 7 ----- recipes/libcf/deactivate.sh | 27 +++++++++++++++++++ recipes/libcf/meta.yaml | 16 +++++++---- 4 files changed, 92 insertions(+), 12 deletions(-) create mode 100644 recipes/libcf/activate.sh create mode 100644 recipes/libcf/deactivate.sh diff --git a/recipes/libcf/activate.sh b/recipes/libcf/activate.sh new file mode 100644 index 0000000000000..e45150ab09e3a --- /dev/null +++ b/recipes/libcf/activate.sh @@ -0,0 +1,54 @@ +#!/bin/bash + +#export CPPFLAGS="-I${PREFIX}/include ${CPPFLAGS}" +#export LDFLAGS="-L${PREFIX}/lib ${LDFLAGS}" +#export LFLAGS="-fPIC ${LFLAGS}" + +if [ "$(uname)" == "Darwin" ] +then +#if [ "$(uname)" == "Darwin" ]; then +# export CXXFLAGS="${CXXFLAGS} -fno-common" +# export MACOSX_DEPLOYMENT_TARGET=$(sw_vers -productVersion | sed -E "s/([0-9]+\.[0-9]+).*/\1/") +# export DYLD_FALLBACK_LIBRARY_PATH=${PREFIX}/lib +# export LDFLAGS="${LDFLAGS} -lpython" +#fi + + # for Mac OSX + export CC=clang + export CXX=clang++ + export MACOSX_VERSION_MIN="10.9" + export MACOSX_DEPLOYMENT_TARGET="${MACOSX_VERSION_MIN}" + export CMAKE_OSX_DEPLOYMENT_TARGET="${MACOSX_VERSION_MIN}" + export CFLAGS="${CFLAGS} -mmacosx-version-min=${MACOSX_VERSION_MIN}" + export CXXFLAGS="${CXXFLAGS} -mmacosx-version-min=${MACOSX_VERSION_MIN}" + export CXXFLAGS="${CXXFLAGS} -stdlib=libc++" + export LDFLAGS="${LDFLAGS} -headerpad_max_install_names" + export LDFLAGS="${LDFLAGS} -mmacosx-version-min=${MACOSX_VERSION_MIN}" + export LDFLAGS="${LDFLAGS} -lc++ -lpython" + export LINKFLAGS="${LDFLAGS}" +elif [ "$(uname)" == "Linux" ] +then + # for Linux + export CC=gcc + export CXX=g++ + export CFLAGS="${CFLAGS}" + # Boost wants to enable `float128` support on Linux by default. + # However, we don't install `libquadmath` so it will fail to find + # the needed headers and fail to compile things. Adding this flag + # tells Boost not to support `float128` and avoids this search + # process. As it has confused a few people. We have added it here. + # The idea to add this flag was inspired by this Boost ticked. + # + # https://svn.boost.org/trac/boost/ticket/9240 + # + export CXXFLAGS="${CXXFLAGS} -DBOOST_MATH_DISABLE_FLOAT128" + export LDFLAGS="${LDFLAGS}" + export LINKFLAGS="${LDFLAGS}" +else + echo "This system is unsupported by the toolchain." + exit 1 +fi + +export CFLAGS="${CFLAGS} -m${ARCH} -Wall -pipe -O2 -fPIC" +export CXXFLAGS="${CXXFLAGS} ${CFLAGS}" + diff --git a/recipes/libcf/build.sh b/recipes/libcf/build.sh index 3c26f8a8d7113..94a1c17521ace 100644 --- a/recipes/libcf/build.sh +++ b/recipes/libcf/build.sh @@ -11,13 +11,6 @@ if [ "$(uname)" == "Darwin" ]; then export LDFLAGS="${LDFLAGS} -lpython" fi -CONDA_LST=`conda list` -if [[ ${CONDA_LST}'y' == *'openmpi'* ]]; then - export CC=mpicc - export CXX=mpicxx - export LC_RPATH="${PREFIX}/lib" - export DYLD_FALLBACK_LIBRARY_PATH=${PREFIX}/lib -fi ./configure --prefix=${PREFIX} ${PYTHON} setup.py install if [ `uname` == Darwin ]; then install_name_tool -change /System/Library/Frameworks/Python.framework/Versions/2.7/Python @rpath/libpython2.7.dylib ${SP_DIR}/pycf/*.so ; fi diff --git a/recipes/libcf/deactivate.sh b/recipes/libcf/deactivate.sh new file mode 100644 index 0000000000000..091729acd32bc --- /dev/null +++ b/recipes/libcf/deactivate.sh @@ -0,0 +1,27 @@ +#!/bin/bash + +if [ "$(uname)" == "Darwin" ]; +then + # for Mac OSX + unset CC + unset CXX + unset MACOSX_VERSION_MIN + unset MACOSX_DEPLOYMENT_TARGET + unset CMAKE_OSX_DEPLOYMENT_TARGET + unset CFLAGS + unset CXXFLAGS + unset LDFLAGS + unset LINKFLAGS +elif [ "$(uname)" == "Linux" ] +then + # for Linux + unset CC + unset CXX + unset CFLAGS + unset CXXFLAGS + unset LDFLAGS + unset LINKFLAGS +else + echo "This system is unsupported by our toolchain." + exit 1 +fi diff --git a/recipes/libcf/meta.yaml b/recipes/libcf/meta.yaml index 5cc3d00ec5c50..700f6c9e1a14f 100644 --- a/recipes/libcf/meta.yaml +++ b/recipes/libcf/meta.yaml @@ -16,18 +16,18 @@ build: requirements: build: - - hdf5 - - libnetcdf + - python + - hdf5 1.8.17|1.8.17.* + - libnetcdf 4.4.* - lapack >=3.4.2 - clapack >=3.2.1 - curl - - python - ossuuid - gcc run: - python - - hdf5 - - libnetcdf + - hdf5 1.8.17|1.8.17.* + - libnetcdf 4.4.* - lapack >=3.4.2 - clapack >=3.2.1 - curl @@ -35,6 +35,12 @@ requirements: - libgcc test: + commands: + # Verify the scripts are in-place. + {% for state in ["activate", "deactivate"] %} + - test -f "${PREFIX}/etc/conda/{{ state }}.d/toolchain_{{ state }}.sh" # [unix] + {% endfor %} + imports: - pycf From aedaa32810e0b5f8e3dc1e4357cac55ca1f5a7f0 Mon Sep 17 00:00:00 2001 From: Denis Nadeau Date: Fri, 17 Feb 2017 16:38:58 -0800 Subject: [PATCH 17/19] let toolchain do its own magick in meta.yaml [skip appveyor] --- recipes/libcf/activate.sh | 54 ------------------------------------- recipes/libcf/build.sh | 6 ----- recipes/libcf/deactivate.sh | 27 ------------------- recipes/libcf/meta.yaml | 7 +---- 4 files changed, 1 insertion(+), 93 deletions(-) delete mode 100644 recipes/libcf/activate.sh delete mode 100644 recipes/libcf/deactivate.sh diff --git a/recipes/libcf/activate.sh b/recipes/libcf/activate.sh deleted file mode 100644 index e45150ab09e3a..0000000000000 --- a/recipes/libcf/activate.sh +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/bash - -#export CPPFLAGS="-I${PREFIX}/include ${CPPFLAGS}" -#export LDFLAGS="-L${PREFIX}/lib ${LDFLAGS}" -#export LFLAGS="-fPIC ${LFLAGS}" - -if [ "$(uname)" == "Darwin" ] -then -#if [ "$(uname)" == "Darwin" ]; then -# export CXXFLAGS="${CXXFLAGS} -fno-common" -# export MACOSX_DEPLOYMENT_TARGET=$(sw_vers -productVersion | sed -E "s/([0-9]+\.[0-9]+).*/\1/") -# export DYLD_FALLBACK_LIBRARY_PATH=${PREFIX}/lib -# export LDFLAGS="${LDFLAGS} -lpython" -#fi - - # for Mac OSX - export CC=clang - export CXX=clang++ - export MACOSX_VERSION_MIN="10.9" - export MACOSX_DEPLOYMENT_TARGET="${MACOSX_VERSION_MIN}" - export CMAKE_OSX_DEPLOYMENT_TARGET="${MACOSX_VERSION_MIN}" - export CFLAGS="${CFLAGS} -mmacosx-version-min=${MACOSX_VERSION_MIN}" - export CXXFLAGS="${CXXFLAGS} -mmacosx-version-min=${MACOSX_VERSION_MIN}" - export CXXFLAGS="${CXXFLAGS} -stdlib=libc++" - export LDFLAGS="${LDFLAGS} -headerpad_max_install_names" - export LDFLAGS="${LDFLAGS} -mmacosx-version-min=${MACOSX_VERSION_MIN}" - export LDFLAGS="${LDFLAGS} -lc++ -lpython" - export LINKFLAGS="${LDFLAGS}" -elif [ "$(uname)" == "Linux" ] -then - # for Linux - export CC=gcc - export CXX=g++ - export CFLAGS="${CFLAGS}" - # Boost wants to enable `float128` support on Linux by default. - # However, we don't install `libquadmath` so it will fail to find - # the needed headers and fail to compile things. Adding this flag - # tells Boost not to support `float128` and avoids this search - # process. As it has confused a few people. We have added it here. - # The idea to add this flag was inspired by this Boost ticked. - # - # https://svn.boost.org/trac/boost/ticket/9240 - # - export CXXFLAGS="${CXXFLAGS} -DBOOST_MATH_DISABLE_FLOAT128" - export LDFLAGS="${LDFLAGS}" - export LINKFLAGS="${LDFLAGS}" -else - echo "This system is unsupported by the toolchain." - exit 1 -fi - -export CFLAGS="${CFLAGS} -m${ARCH} -Wall -pipe -O2 -fPIC" -export CXXFLAGS="${CXXFLAGS} ${CFLAGS}" - diff --git a/recipes/libcf/build.sh b/recipes/libcf/build.sh index 94a1c17521ace..e236e3daf2c4a 100644 --- a/recipes/libcf/build.sh +++ b/recipes/libcf/build.sh @@ -4,12 +4,6 @@ export CPPFLAGS="-I${PREFIX}/include ${CPPFLAGS}" export LDFLAGS="-L${PREFIX}/lib ${LDFLAGS}" export LFLAGS="-fPIC ${LFLAGS}" -if [ "$(uname)" == "Darwin" ]; then - export CXXFLAGS="${CXXFLAGS} -fno-common" - export MACOSX_DEPLOYMENT_TARGET=$(sw_vers -productVersion | sed -E "s/([0-9]+\.[0-9]+).*/\1/") - export DYLD_FALLBACK_LIBRARY_PATH=${PREFIX}/lib - export LDFLAGS="${LDFLAGS} -lpython" -fi ./configure --prefix=${PREFIX} ${PYTHON} setup.py install diff --git a/recipes/libcf/deactivate.sh b/recipes/libcf/deactivate.sh deleted file mode 100644 index 091729acd32bc..0000000000000 --- a/recipes/libcf/deactivate.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash - -if [ "$(uname)" == "Darwin" ]; -then - # for Mac OSX - unset CC - unset CXX - unset MACOSX_VERSION_MIN - unset MACOSX_DEPLOYMENT_TARGET - unset CMAKE_OSX_DEPLOYMENT_TARGET - unset CFLAGS - unset CXXFLAGS - unset LDFLAGS - unset LINKFLAGS -elif [ "$(uname)" == "Linux" ] -then - # for Linux - unset CC - unset CXX - unset CFLAGS - unset CXXFLAGS - unset LDFLAGS - unset LINKFLAGS -else - echo "This system is unsupported by our toolchain." - exit 1 -fi diff --git a/recipes/libcf/meta.yaml b/recipes/libcf/meta.yaml index 700f6c9e1a14f..88063da2de932 100644 --- a/recipes/libcf/meta.yaml +++ b/recipes/libcf/meta.yaml @@ -16,6 +16,7 @@ build: requirements: build: + - toochain [osx] - python - hdf5 1.8.17|1.8.17.* - libnetcdf 4.4.* @@ -35,12 +36,6 @@ requirements: - libgcc test: - commands: - # Verify the scripts are in-place. - {% for state in ["activate", "deactivate"] %} - - test -f "${PREFIX}/etc/conda/{{ state }}.d/toolchain_{{ state }}.sh" # [unix] - {% endfor %} - imports: - pycf From 9851167ad5dad995b9367554fdbe8091f34f4f0f Mon Sep 17 00:00:00 2001 From: Denis Nadeau Date: Fri, 17 Feb 2017 16:42:19 -0800 Subject: [PATCH 18/19] add space before #[] --- recipes/libcf/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/libcf/meta.yaml b/recipes/libcf/meta.yaml index 88063da2de932..4c654a7815278 100644 --- a/recipes/libcf/meta.yaml +++ b/recipes/libcf/meta.yaml @@ -16,7 +16,7 @@ build: requirements: build: - - toochain [osx] + - toochain # [osx] - python - hdf5 1.8.17|1.8.17.* - libnetcdf 4.4.* From b48bbdd3a834900c1efcaae1811be829984f0a95 Mon Sep 17 00:00:00 2001 From: Denis Date: Sat, 18 Feb 2017 11:23:38 -0800 Subject: [PATCH 19/19] change number to 1 and replace libgcc for libgfortran --- recipes/libcf/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/libcf/meta.yaml b/recipes/libcf/meta.yaml index 4c654a7815278..f74315e362f74 100644 --- a/recipes/libcf/meta.yaml +++ b/recipes/libcf/meta.yaml @@ -11,7 +11,7 @@ source: sha256: e40d3826ca2b47538b075f69f716798e255fe396fd3ae68e8b051be57a951bb4 build: - number: 1 + number: 0 skip: True # [win or py3k] requirements: @@ -33,7 +33,7 @@ requirements: - clapack >=3.2.1 - curl - ossuuid - - libgcc + - libgfortran test: imports: