diff --git a/ports/hdf5/fix-parallel.patch b/ports/hdf5/fix-parallel.patch new file mode 100644 index 00000000000000..c21527ed643f0f --- /dev/null +++ b/ports/hdf5/fix-parallel.patch @@ -0,0 +1,22 @@ +diff --git a/config/cmake/ConfigureChecks.cmake b/config/cmake/ConfigureChecks.cmake +index 902ddd3..c333590 100644 +--- a/config/cmake/ConfigureChecks.cmake ++++ b/config/cmake/ConfigureChecks.cmake +@@ -283,7 +283,7 @@ macro (C_RUN FUNCTION_NAME SOURCE_CODE RETURN_VAR) + + if (${COMPILE_RESULT_VAR}) + if (${RUN_RESULT_VAR} MATCHES 0) +- set (${RUN_RESULT_VAR} 1 CACHE INTERNAL "Have C function ${FUNCTION_NAME}") ++ set (${RETURN_VAR} 1 CACHE INTERNAL "Have C function ${FUNCTION_NAME}") + if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0") + message (VERBOSE "Testing C ${FUNCTION_NAME} - OK") + endif () +@@ -295,7 +295,7 @@ macro (C_RUN FUNCTION_NAME SOURCE_CODE RETURN_VAR) + if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0") + message (VERBOSE "Testing C ${FUNCTION_NAME} - Fail") + endif () +- set (${RUN_RESULT_VAR} 0 CACHE INTERNAL "Have C function ${FUNCTION_NAME}") ++ set (${RETURN_VAR} 0 CACHE INTERNAL "Have C function ${FUNCTION_NAME}") + file (APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log + "Determining if the C ${FUNCTION_NAME} exists failed with the following output:\n" + "${OUTPUT_VAR}\n\n") diff --git a/ports/hdf5/portfile.cmake b/ports/hdf5/portfile.cmake index 6383a4826f02e2..d974aa65e8df1a 100644 --- a/ports/hdf5/portfile.cmake +++ b/ports/hdf5/portfile.cmake @@ -11,6 +11,7 @@ vcpkg_from_github( szip.patch pkgconfig-requires.patch pkgconfig-link-order.patch + fix-parallel.patch # Remove this patch in the next update, see https://github.com/HDFGroup/hdf5/pull/860 ) set(ALLOW_UNSUPPORTED OFF) diff --git a/ports/hdf5/vcpkg.json b/ports/hdf5/vcpkg.json index d535ebfa54f279..4fd14077d29428 100644 --- a/ports/hdf5/vcpkg.json +++ b/ports/hdf5/vcpkg.json @@ -1,9 +1,10 @@ { "name": "hdf5", "version": "1.12.1", - "port-version": 4, + "port-version": 5, "description": "HDF5 is a data model, library, and file format for storing and managing data", "homepage": "https://www.hdfgroup.org/downloads/hdf5/", + "license": "BSD-3-Clause", "supports": "!uwp", "dependencies": [ { diff --git a/versions/baseline.json b/versions/baseline.json index 78c07220b9878f..2bd25c9a793196 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2754,7 +2754,7 @@ }, "hdf5": { "baseline": "1.12.1", - "port-version": 4 + "port-version": 5 }, "healpix": { "baseline": "1.12.10", diff --git a/versions/h-/hdf5.json b/versions/h-/hdf5.json index a82c072f61ac9c..9d7dc7220b5556 100644 --- a/versions/h-/hdf5.json +++ b/versions/h-/hdf5.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c6491dde27884b1326e6f74f3862c1ae63a122ca", + "version": "1.12.1", + "port-version": 5 + }, { "git-tree": "1000a70aefebfdd856715d265c3421c80157b773", "version": "1.12.1",