[hwloc|hpx] Update to latest version (#24918)

* update hpx and hwloc

* v db

* remove unnecessary patch

* v db

* allow CMAKE_CXX_STANDARD to be set

* v db

ports/hpx/fix-cmakecache-paths.patch

@@ -1,22 +0,0 @@
-diff --git a/cmake/HPX_ForwardCacheVariables.cmake b/cmake/HPX_ForwardCacheVariables.cmake
-index 7c434085a76..34cc47c7750 100644
---- a/cmake/HPX_ForwardCacheVariables.cmake
-+++ b/cmake/HPX_ForwardCacheVariables.cmake
-@@ -23,6 +23,17 @@ set(_cache_var_file_template
- )
- set(_cache_variables)
- foreach(_var IN LISTS cache_vars)
-+  if(HPX_WITH_VCPKG)
-+    # avoid writing directory names into cache file
-+    string(FIND ${_var} "_DIR" _pos)
-+    if(NOT ${_pos} EQUAL -1)
-+      continue()
-+    endif()
-+    string(FIND ${_var} "_PATH" _pos)
-+    if(NOT ${_pos} EQUAL -1)
-+      continue()
-+    endif()
-+  endif()
-   set(_cache_variables "${_cache_variables}set(${_var} ${${_var}})\n")
- endforeach()
- 

ports/hpx/portfile.cmake

@@ -3,12 +3,11 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO STEllAR-GROUP/hpx
-    REF 1.7.1
-    SHA512 6bdb294da393a198abf81d5f63799a066334755eed0fda40bbfc4e9a774b6e19a3e5ad7ab45c989d31f3797e7b547bb552c29f51b552d9a79d166f86aee375a3
+    REF f48c81865800ae72618b40b4e79d4168cfb0bd56
+    SHA512 06d1384615b327194d871145c1899317bd350c43a072be2cbfdc773f7869b71aafce3e9cabf835a8fe902a13d7050d5e0400a76f74023985575347a645196b1d
     HEAD_REF stable
     PATCHES
         fix-dependency-hwloc.patch
-        fix-cmakecache-paths.patch
 )
 
 set(HPX_WITH_MALLOC system)
@@ -28,6 +27,7 @@ vcpkg_cmake_configure(
         -DHPX_WITH_EXAMPLES=OFF
         -DHPX_WITH_TOOLS=OFF
         -DHPX_WITH_RUNTIME=OFF
+        -DHPX_USE_CMAKE_CXX_STANDARD=ON
         "-DHPX_WITH_MALLOC=${HPX_WITH_MALLOC}"
 )
 

ports/hpx/vcpkg.json

@@ -1,7 +1,6 @@
 {
   "name": "hpx",
-  "version-semver": "1.7.1",
-  "port-version": 5,
+  "version": "1.8.0",
   "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."

ports/hwloc/portfile.cmake

@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO open-mpi/hwloc
-    REF 6fa8466a9c9c28de8ca3bd9e879c426edd85decf # hwloc-2.7.0
-    SHA512 33bcc30362ba27076eacc83327a9d6235e2914a3c64536631e05e2d44c2c12b0176d55cc42ec0dc3c80682b977a83e60bd3a41f3ef486581cf8afa62ad2e9516
+    REF 3cf146011de099c53efee163ea7d3a059fd7bd60 # hwloc-2.7.1
+    SHA512 c6c4fbd3a1bea2bd1df65b7512748cd10944a255b145effe6f75d5fa2c5b1da32d344f2cbff3062391d47230e84361620c69f87500113b45992282a512be90b4
     PATCHES
         fix_shared_win_build.patch
 )

ports/hwloc/vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "hwloc",
-  "version": "2.7.0",
+  "version": "2.7.1",
   "maintainers": "bgoglin<Brice.Goglin@inria.fr>",
   "description": [
     "Portable Hardware Locality (hwloc)",

versions/baseline.json

@@ -2793,8 +2793,8 @@
       "port-version": 0
     },
     "hpx": {
-      "baseline": "1.7.1",
-      "port-version": 5
+      "baseline": "1.8.0",
+      "port-version": 0
     },
     "http-parser": {
       "baseline": "2.9.4",
@@ -2809,7 +2809,7 @@
       "port-version": 8
     },
     "hwloc": {
-      "baseline": "2.7.0",
+      "baseline": "2.7.1",
       "port-version": 0
     },
     "hyperscan": {

versions/h-/hpx.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "2bd151915f73223a06d9470f38f56d253392a484",
+      "version": "1.8.0",
+      "port-version": 0
+    },
     {
       "git-tree": "48d153f2932b01257af5a799676268abdfb35fac",
       "version-semver": "1.7.1",

versions/h-/hwloc.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "3ce0161512ee6cc0ef1f2e68a6c73db63422f0ee",
+      "version": "2.7.1",
+      "port-version": 0
+    },
     {
       "git-tree": "22d2c0f63d27b10b032eb6cb3bd07055300fc961",
       "version": "2.7.0",