Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

netcdf-fortran v4.5.0 #33

Merged
merged 7 commits into from
Aug 30, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions .ci_support/linux_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 0 additions & 5 deletions .ci_support/osx_fortran_compiler_version4.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 0 additions & 5 deletions .ci_support/osx_fortran_compiler_version7.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 4 additions & 4 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{% set version = "4.4.5" %}
{% set version = "4.5.0" %}

package:
name: netcdf-fortran
version: {{ version }}

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:
Expand Down
39 changes: 32 additions & 7 deletions recipe/no_clang.patch
Original file line number Diff line number Diff line change
@@ -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