diff options
| author | Hartmut Kaiser <hartmut.kaiser@gmail.com> | 2021-08-18 19:07:51 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-18 17:07:51 -0700 |
| commit | d73f3703f7a649becdbd609ea4b29ee92fc80617 (patch) | |
| tree | c5b5b57db391ce4bccdbadccd3c827f5551a4c28 | |
| parent | 6b24f0fa76d171c5756f01f407682f7274cfe238 (diff) | |
| download | vcpkg-d73f3703f7a649becdbd609ea4b29ee92fc80617.tar.gz vcpkg-d73f3703f7a649becdbd609ea4b29ee92fc80617.zip | |
Adapting for HPX V1.7.1 (#19585)
| -rw-r--r-- | ports/hpx/hpx-1.7.0-format-from-string.patch | 12 | ||||
| -rw-r--r-- | ports/hpx/portfile.cmake | 6 | ||||
| -rw-r--r-- | ports/hpx/vcpkg.json | 2 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/h-/hpx.json | 5 |
5 files changed, 9 insertions, 18 deletions
diff --git a/ports/hpx/hpx-1.7.0-format-from-string.patch b/ports/hpx/hpx-1.7.0-format-from-string.patch deleted file mode 100644 index 2aa2d3eb4..000000000 --- a/ports/hpx/hpx-1.7.0-format-from-string.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/libs/core/format/include/hpx/util/from_string.hpp b/libs/core/format/include/hpx/util/from_string.hpp -index 07eb9b68dfb..c3d0d857143 100644 ---- a/libs/core/format/include/hpx/util/from_string.hpp -+++ b/libs/core/format/include/hpx/util/from_string.hpp -@@ -10,6 +10,7 @@ - #include <hpx/util/bad_lexical_cast.hpp> - - #include <algorithm> -+#include <cctype> - #include <cstddef> - #include <limits> - #include <sstream> diff --git a/ports/hpx/portfile.cmake b/ports/hpx/portfile.cmake index aee67742e..e8bbd3a56 100644 --- a/ports/hpx/portfile.cmake +++ b/ports/hpx/portfile.cmake @@ -4,11 +4,9 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO STEllAR-GROUP/hpx - REF 1.7.0 - SHA512 052b3278710d8047c8e0e0979a668aa5161c495fcd12b089dd5039c64bd414b4ec0b96dfcd414d68e0db5b31c360dffb84374413c53794f37ce77d9cabc89518 + REF 1.7.1 + SHA512 6bdb294da393a198abf81d5f63799a066334755eed0fda40bbfc4e9a774b6e19a3e5ad7ab45c989d31f3797e7b547bb552c29f51b552d9a79d166f86aee375a3 HEAD_REF stable - PATCHES - hpx-1.7.0-format-from-string.patch ) vcpkg_configure_cmake( diff --git a/ports/hpx/vcpkg.json b/ports/hpx/vcpkg.json index fdb0c6306..f628a848a 100644 --- a/ports/hpx/vcpkg.json +++ b/ports/hpx/vcpkg.json @@ -1,6 +1,6 @@ { "name": "hpx", - "version-string": "1.7.0", + "version-semver": "1.7.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." diff --git a/versions/baseline.json b/versions/baseline.json index 28551738f..68735689f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2549,7 +2549,7 @@ "port-version": 1 }, "hpx": { - "baseline": "1.7.0", + "baseline": "1.7.1", "port-version": 0 }, "http-parser": { diff --git a/versions/h-/hpx.json b/versions/h-/hpx.json index fc9d09da7..84c8a4d9f 100644 --- a/versions/h-/hpx.json +++ b/versions/h-/hpx.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "d55f05944b91ea48152696beb48444cad53ba8e1", + "version-semver": "1.7.1", + "port-version": 0 + }, + { "git-tree": "6abaf9002afc0d46fd8700438776403d63959ebf", "version-string": "1.7.0", "port-version": 0 |