From 768d6a77145f2461a58fbb68b6c08d2b6d227daf Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot Date: Thu, 29 Aug 2019 17:27:54 +0000 Subject: [PATCH 1/7] updated v4.5.0 --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 1188e53e..e677b654 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "4.4.5" %} +{% set version = "4.5.0" %} package: name: netcdf-fortran @@ -6,12 +6,12 @@ package: source: url: https://github.com/Unidata/netcdf-fortran/archive/v{{ version }}.tar.gz - sha256: 01643461ac42d1986e38a052eb021135bae5b6cd592373fb44cf832236791c03 + sha256: 23d60050e4bfded7c1f7ffc52b97949fa8f981dfaa138af88ba0d6e06586d8c0 patches: - no_clang.patch # [osx] build: - number: 1002 + number: 0 skip: True # [win] requirements: From a67dd97cd4eac7dd2e6e11e3d0207dbcc0dee5b1 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot Date: Thu, 29 Aug 2019 17:28:07 +0000 Subject: [PATCH 2/7] MNT: Re-rendered with conda-build 3.18.9, conda-smithy 3.4.1, and conda-forge-pinning 2019.08.27 --- .ci_support/linux_.yaml | 5 ----- .ci_support/osx_fortran_compiler_version4.yaml | 5 ----- .ci_support/osx_fortran_compiler_version7.yaml | 5 ----- 3 files changed, 15 deletions(-) diff --git a/.ci_support/linux_.yaml b/.ci_support/linux_.yaml index 20658bb2..0c2fbc9f 100644 --- a/.ci_support/linux_.yaml +++ b/.ci_support/linux_.yaml @@ -14,8 +14,3 @@ fortran_compiler_version: - '7' hdf5: - 1.10.5 -libnetcdf: -- 4.6.2 -pin_run_as_build: - libnetcdf: - max_pin: x.x.x diff --git a/.ci_support/osx_fortran_compiler_version4.yaml b/.ci_support/osx_fortran_compiler_version4.yaml index 63b90fa0..7d6fc5aa 100644 --- a/.ci_support/osx_fortran_compiler_version4.yaml +++ b/.ci_support/osx_fortran_compiler_version4.yaml @@ -14,12 +14,7 @@ fortran_compiler_version: - '4' hdf5: - 1.10.5 -libnetcdf: -- 4.6.2 macos_machine: - x86_64-apple-darwin13.4.0 macos_min_version: - '10.9' -pin_run_as_build: - libnetcdf: - max_pin: x.x.x diff --git a/.ci_support/osx_fortran_compiler_version7.yaml b/.ci_support/osx_fortran_compiler_version7.yaml index 0fffbf80..78393376 100644 --- a/.ci_support/osx_fortran_compiler_version7.yaml +++ b/.ci_support/osx_fortran_compiler_version7.yaml @@ -14,12 +14,7 @@ fortran_compiler_version: - '7' hdf5: - 1.10.5 -libnetcdf: -- 4.6.2 macos_machine: - x86_64-apple-darwin13.4.0 macos_min_version: - '10.9' -pin_run_as_build: - libnetcdf: - max_pin: x.x.x From f6fb881b449d0920cab58ab5cf52e56e8905a8fc Mon Sep 17 00:00:00 2001 From: "Matthew R. Becker" Date: Fri, 30 Aug 2019 07:05:35 -0500 Subject: [PATCH 3/7] Update no_clang.patch --- recipe/no_clang.patch | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/recipe/no_clang.patch b/recipe/no_clang.patch index b215b90c..5b8dfb30 100644 --- a/recipe/no_clang.patch +++ b/recipe/no_clang.patch @@ -1,12 +1,15 @@ ---- CMakeLists.txt 2016-05-13 18:17:37.000000000 -0300 -+++ CMakeLists.txt 2016-06-20 09:51:58.276466121 -0300 -@@ -482,9 +482,6 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -574,12 +574,6 @@ ENDIF() + IF (UNIX AND ${CMAKE_SIZEOF_VOID_P} MATCHES "8") ADD_DEFINITIONS(-DLONGLONG_IS_LONG) - # for easier debugging of cfortran.h +- # for easier debugging of cfortran.h - IF (APPLE) -- SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fmacro-backtrace-limit=0") -- endif () +- IF(CMAKE_CXX_COMPILER_ID MATCHES "Clang") +- SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fmacro-backtrace-limit=0") +- ENDIF() +- ENDIF(APPLE) ENDIF() - # Determine C/Fortran pointer compatibility. + # Determine C library setting for NC_RELAX_COORD_BOUND From e1bf89ceea81094c634b65a04278e6ec4b490a69 Mon Sep 17 00:00:00 2001 From: "Matthew R. Becker" Date: Fri, 30 Aug 2019 07:18:56 -0500 Subject: [PATCH 4/7] try removing this hack --- recipe/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/build.sh b/recipe/build.sh index 29ac3a11..c7b3e47c 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -18,7 +18,7 @@ fi # and general chaos in the builds here. An attempt at patching upstream was # made, but getting that working fully and robustly appears difficult. This # should just work all the time. -rm -rf ${PREFIX}/lib/cmake/netCDF/* +# rm -rf ${PREFIX}/lib/cmake/netCDF/* # Build static. mkdir build_static && cd build_static From f841215e13de2203ffb7ee00287dddc16b3d0d95 Mon Sep 17 00:00:00 2001 From: "Matthew R. Becker" Date: Fri, 30 Aug 2019 07:27:15 -0500 Subject: [PATCH 5/7] Update build.sh --- recipe/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/build.sh b/recipe/build.sh index c7b3e47c..29ac3a11 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -18,7 +18,7 @@ fi # and general chaos in the builds here. An attempt at patching upstream was # made, but getting that working fully and robustly appears difficult. This # should just work all the time. -# rm -rf ${PREFIX}/lib/cmake/netCDF/* +rm -rf ${PREFIX}/lib/cmake/netCDF/* # Build static. mkdir build_static && cd build_static From 0a59d018f5e0d6505b0f92d31e9e99c30293464f Mon Sep 17 00:00:00 2001 From: "Matthew R. Becker" Date: Fri, 30 Aug 2019 08:53:02 -0500 Subject: [PATCH 6/7] Update no_clang.patch --- recipe/no_clang.patch | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/recipe/no_clang.patch b/recipe/no_clang.patch index 5b8dfb30..86d40b39 100644 --- a/recipe/no_clang.patch +++ b/recipe/no_clang.patch @@ -13,3 +13,25 @@ ENDIF() # Determine C library setting for NC_RELAX_COORD_BOUND +@@ -719,7 +713,7 @@ ENDIF(ENABLE_FORTRAN_TYPE_CHECKS) + # FILE(RENAME "${NC4F_BINARY_DIR}/nf-config.cmake.in" "${NC4F_BINARY_DIR}/nf-config") + + # make sure previous two files get cleaned up... +-SET_DIRECTORY_PROPERTIES (DIRECTORY PROPERTY ADDITIONAL_MAKE_CLEAN_FILES ${netcdf-fortran_BINARY_DIR}/config.h ${netcdf-fortran_BINARY_DIR}/nf-config) ++# SET_DIRECTORY_PROPERTIES (DIRECTORY PROPERTY ADDITIONAL_MAKE_CLEAN_FILES ${netcdf-fortran_BINARY_DIR}/config.h ${netcdf-fortran_BINARY_DIR}/nf-config) + + ## + # Configuration for post-install RPath +@@ -842,9 +836,9 @@ IF(CMAKE_LINK_FLAGS) + ENDIF() + + +-INSTALL(PROGRAMS ${NC4F_BINARY_DIR}/nf-config +- DESTINATION "${CMAKE_INSTALL_BINDIR}" +- COMPONENT utilities) ++# INSTALL(PROGRAMS ${NC4F_BINARY_DIR}/nf-config ++# DESTINATION "${CMAKE_INSTALL_BINDIR}" ++# COMPONENT utilities) + + INCLUDE_DIRECTORIES(${NC4F_BINARY_DIR}) + # End autotools-style checks for config.h From 9cc653852b05b52f972aeb764cd666f3211846f3 Mon Sep 17 00:00:00 2001 From: "Matthew R. Becker" Date: Fri, 30 Aug 2019 09:59:06 -0500 Subject: [PATCH 7/7] Update meta.yaml --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index e677b654..51b0fdfd 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -8,7 +8,7 @@ source: url: https://github.com/Unidata/netcdf-fortran/archive/v{{ version }}.tar.gz sha256: 23d60050e4bfded7c1f7ffc52b97949fa8f981dfaa138af88ba0d6e06586d8c0 patches: - - no_clang.patch # [osx] + - no_clang.patch build: number: 0