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 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 1188e53e..51b0fdfd 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] + - no_clang.patch build: - number: 1002 + number: 0 skip: True # [win] requirements: diff --git a/recipe/no_clang.patch b/recipe/no_clang.patch index b215b90c..86d40b39 100644 --- a/recipe/no_clang.patch +++ b/recipe/no_clang.patch @@ -1,12 +1,37 @@ ---- 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 +@@ -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