From 9c64518a4c53d6c1a36b719e3dfebf0c9dbc1c2e Mon Sep 17 00:00:00 2001 From: Hartmut Kaiser Date: Thu, 10 Aug 2023 14:16:33 -0500 Subject: [PATCH] Adding support for HPX release v1.9.1 --- ports/hpx/portfile.cmake | 12 +++++++----- ports/hpx/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/h-/hpx.json | 5 +++++ 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/ports/hpx/portfile.cmake b/ports/hpx/portfile.cmake index 1d2d13a147f706..d2723a789f634c 100644 --- a/ports/hpx/portfile.cmake +++ b/ports/hpx/portfile.cmake @@ -6,8 +6,8 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" HPX_WITH_STATIC_LINKING vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO STEllAR-GROUP/hpx - REF "${VERSION}" - SHA512 af2471a04dd0a3c414907ed06661ab1c6f6a49cc09d1ed3ae5d5587ca365270797a1d2ce9d0320dc7d7f9ff2c6d29037c7fbb84fa6d9c0033628ba7036f12986 + REF "v${VERSION}" + SHA512 a7972beada950cf6ef3b61f20496a08b220e4f48c28c11d57c20683906ca5124a9f36ac2552318883a5ab1db6efdbf63d1141b6e0c484c560a8c1311ae2d7090 HEAD_REF stable PATCHES fix-dependency-hwloc.patch @@ -90,9 +90,11 @@ vcpkg_fixup_pkgconfig() file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/hpxcxx" "${CURRENT_PACKAGES_DIR}/debug/bin/hpxcxx") -file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}") -file(RENAME "${CURRENT_PACKAGES_DIR}/bin/hpxrun.py" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/hpxrun.py") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/hpxrun.py" "'${CURRENT_INSTALLED_DIR}/tools/openmpi/bin/mpiexec'" "'mpiexec'") +if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/hpxrun.py") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}") + file(RENAME "${CURRENT_PACKAGES_DIR}/bin/hpxrun.py" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/hpxrun.py") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/hpxrun.py" "'${CURRENT_INSTALLED_DIR}/tools/openmpi/bin/mpiexec'" "'mpiexec'") +endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") diff --git a/ports/hpx/vcpkg.json b/ports/hpx/vcpkg.json index 034a171c988a58..17eba54ff37aa1 100644 --- a/ports/hpx/vcpkg.json +++ b/ports/hpx/vcpkg.json @@ -1,12 +1,13 @@ { "name": "hpx", - "version": "1.8.1", + "version": "1.9.1", "description": [ "The C++ Standards Library for Concurrency and Parallelism", "HPX is a C++ Standards Library for Concurrency and Parallelism. It implements all of the corresponding facilities as defined by the C++ Standard. Additionally, in HPX we implement functionalities proposed as part of the ongoing C++ standardization process. We also extend the C++ Standard APIs to the distributed case." ], "homepage": "https://github.com/STEllAR-GROUP/hpx", "license": "BSL-1.0", + "supports": "!(windows & x86)", "dependencies": [ "asio", "boost-accumulators", diff --git a/versions/baseline.json b/versions/baseline.json index faecc32bf5ffe9..6483b8413dc8f6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3217,7 +3217,7 @@ "port-version": 0 }, "hpx": { - "baseline": "1.8.1", + "baseline": "1.9.1", "port-version": 0 }, "http-parser": { diff --git a/versions/h-/hpx.json b/versions/h-/hpx.json index 3e92852fef943b..0ae7c9f0eff9f9 100644 --- a/versions/h-/hpx.json +++ b/versions/h-/hpx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "94d5f165d483752d4b7996bd1414497c5299208f", + "version": "1.9.1", + "port-version": 0 + }, { "git-tree": "2d21a35d6723060eccbe376e9e694991cadb90b2", "version": "1.8.1",