diff options
| author | Alexander Neumann <Alexander.Neumann@hamburg.de> | 2019-03-14 22:30:51 +0100 |
|---|---|---|
| committer | Alexander Neumann <Alexander.Neumann@hamburg.de> | 2019-03-14 22:30:51 +0100 |
| commit | 0e898fe892a054eac39aec1fae911e6235fbddfa (patch) | |
| tree | c86d0d390dd4b8461269ea2400e9f912783966aa | |
| parent | 4de9cb0f1b37489e05873634945bde1aa2036e2d (diff) | |
| download | vcpkg-0e898fe892a054eac39aec1fae911e6235fbddfa.tar.gz vcpkg-0e898fe892a054eac39aec1fae911e6235fbddfa.zip | |
update netcdf-c tp 4.6.2 and fixed curl linkage
| -rw-r--r-- | ports/netcdf-c/CONTROL | 2 | ||||
| -rw-r--r-- | ports/netcdf-c/fix_curl_linkage.patch | 12 | ||||
| -rw-r--r-- | ports/netcdf-c/portfile.cmake | 15 |
3 files changed, 21 insertions, 8 deletions
diff --git a/ports/netcdf-c/CONTROL b/ports/netcdf-c/CONTROL index a7f3816ba..33fe98162 100644 --- a/ports/netcdf-c/CONTROL +++ b/ports/netcdf-c/CONTROL @@ -1,4 +1,4 @@ Source: netcdf-c -Version: 4.4.1.1-2 +Version: 4.6.2 Build-Depends: hdf5, curl Description: a set of self-describing, machine-independent data formats that support the creation, access, and sharing of array-oriented scientific data. diff --git a/ports/netcdf-c/fix_curl_linkage.patch b/ports/netcdf-c/fix_curl_linkage.patch new file mode 100644 index 000000000..09fead1f0 --- /dev/null +++ b/ports/netcdf-c/fix_curl_linkage.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index eb0bc26b..f1409fc6 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -783,6 +783,7 @@ IF(ENABLE_DAP) +
+ ADD_DEFINITIONS(-DCURL_STATICLIB=1)
+ INCLUDE_DIRECTORIES(${CURL_INCLUDE_DIRS})
++ LINK_LIBRARIES(${CURL_LIBRARIES})
+
+ # Check to see if CURLOPT_USERNAME is defined.
+ # It is present starting version 7.19.1.
diff --git a/ports/netcdf-c/portfile.cmake b/ports/netcdf-c/portfile.cmake index 4abe0f9dc..4f8f67c96 100644 --- a/ports/netcdf-c/portfile.cmake +++ b/ports/netcdf-c/portfile.cmake @@ -7,20 +7,21 @@ # include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/netcdf-c-4.4.1.1) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/netcdf-c-4.6.2) vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/Unidata/netcdf-c/archive/v4.4.1.1.zip" - FILENAME "netcdf-c-v4.4.1.1.zip" - SHA512 8d31e47f0bd4d5c8640d3444c5c83425862ed1e8283aa78419e86b18d33fd93bfeb0067e8e9630457cb9c334d6fedf630283b5227a15137a3e153d57b22364a8 + URLS "https://github.com/Unidata/netcdf-c/archive/v4.6.2.tar.gz" + FILENAME "netcdf-c-v4.6.2.tar.gz" + SHA512 7c7084e80cf2fb86cd05101f5be7b74797ee96bf49afadfae6ab32ceed6cd9a049bfa90175e7cc0742806bcd2f61156e33fe7930c7b646661d9c89be6b20dea3 ) vcpkg_extract_source_archive(${ARCHIVE}) vcpkg_apply_patches( SOURCE_PATH ${SOURCE_PATH} PATCHES - ${CMAKE_CURRENT_LIST_DIR}/no-install-deps.patch - ${CMAKE_CURRENT_LIST_DIR}/config-pkg-location.patch - ${CMAKE_CURRENT_LIST_DIR}/transitive-hdf5.patch + no-install-deps.patch + config-pkg-location.patch + transitive-hdf5.patch + fix_curl_linkage.patch ) vcpkg_configure_cmake( |