diff options
| author | Hartmut Kaiser <hartmut.kaiser@gmail.com> | 2020-09-03 13:27:20 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-03 11:27:20 -0700 |
| commit | 77b9beb59312f85602282def9b4bbd1744f16d40 (patch) | |
| tree | 1b99c20fa7481b8a8d158de0a59e274350223ae8 | |
| parent | 99754d1c0b5c2bcec659823ca7362873302d1904 (diff) | |
| download | vcpkg-77b9beb59312f85602282def9b4bbd1744f16d40.tar.gz vcpkg-77b9beb59312f85602282def9b4bbd1744f16d40.zip | |
Adapting for HPX V1.5 (#13309)
| -rw-r--r-- | ports/hpx/CONTROL | 4 | ||||
| -rw-r--r-- | ports/hpx/boost-1.73.patch | 13 | ||||
| -rw-r--r-- | ports/hpx/portfile.cmake | 6 |
3 files changed, 4 insertions, 19 deletions
diff --git a/ports/hpx/CONTROL b/ports/hpx/CONTROL index 4bc7d7b62..8363947af 100644 --- a/ports/hpx/CONTROL +++ b/ports/hpx/CONTROL @@ -1,6 +1,6 @@ Source: hpx
-Version: 1.4.1-1
-Build-Depends: hwloc, boost-accumulators, boost-algorithm, boost-asio, boost-assign, boost-bimap, boost-config, boost-context, boost-dynamic-bitset, boost-exception, boost-filesystem, boost-iostreams, boost-lockfree, boost-program-options, boost-range, boost-spirit, boost-system, boost-throw-exception, boost-variant, boost-winapi
+Version: 1.5.0
+Build-Depends: hwloc, boost-accumulators, boost-algorithm, boost-asio, boost-bimap, boost-config, boost-context, boost-dynamic-bitset, boost-exception, boost-filesystem, boost-iostreams, boost-lockfree, boost-program-options, boost-range, boost-spirit, boost-system, boost-throw-exception, boost-variant, boost-winapi
Homepage: https://github.com/STEllAR-GROUP/hpx
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/ports/hpx/boost-1.73.patch b/ports/hpx/boost-1.73.patch deleted file mode 100644 index d45e5cc7f..000000000 --- a/ports/hpx/boost-1.73.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/runtime/agas/addressing_service.cpp b/src/runtime/agas/addressing_service.cpp -index f30760c..7c2785e 100644 ---- a/src/runtime/agas/addressing_service.cpp -+++ b/src/runtime/agas/addressing_service.cpp -@@ -2356,6 +2356,8 @@ void addressing_service::register_counter_types() - util::bind_front( - &addressing_service::get_cache_erase_entry_time, this)); - -+ using util::placeholders::_1; -+ using util::placeholders::_2; - performance_counters::generic_counter_type_data const counter_types[] = - { - { "/agas/count/cache/entries", performance_counters::counter_raw, diff --git a/ports/hpx/portfile.cmake b/ports/hpx/portfile.cmake index 6c369e0a2..dc0129861 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.4.1 - SHA512 f110d5e5c10ec396f6e762568c9ecd5b767cb6efe91168b5caa8fe1e07bb5870cd13b3392fa4e008a2cc0e044b02084a35b0866e943d9b9c7435599c131f1582 + REF 1.5.0 + SHA512 3ce52def94d2d76bc19f0c3a411581a69af95123bbc38b4bd777b8d89523d0e22769ac2e7bb62c756f0126f39c378dfdd503a10499d3497bfe40cc71c046c70b HEAD_REF stable - PATCHES - boost-1.73.patch ) vcpkg_configure_cmake( |