From 55bd82995adfb1db424458b2bc4c94f01d8fe61d Mon Sep 17 00:00:00 2001
From: Leander Schulten <Leander.Schulten@rwth-aachen.de>
Date: Thu, 29 Sep 2022 12:53:11 +0200
Subject: [PATCH] [hpx] no absolute paths

---
 ports/hpx/portfile.cmake | 4 +---
 ports/hpx/vcpkg.json     | 2 +-
 versions/baseline.json   | 2 +-
 versions/h-/hpx.json     | 5 +++++
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/ports/hpx/portfile.cmake b/ports/hpx/portfile.cmake
index 00d351d31f0f15..6401ea5a90dcbf 100644
--- a/ports/hpx/portfile.cmake
+++ b/ports/hpx/portfile.cmake
@@ -90,13 +90,11 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
 vcpkg_fixup_pkgconfig()
 
-vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/bin/hpxcxx" "\"${CURRENT_PACKAGES_DIR}\"" "os.path.dirname(os.path.dirname(os.path.realpath(__file__)))")
-vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/bin/hpxcxx" "\"${CURRENT_PACKAGES_DIR}/debug\"" "os.path.dirname(os.path.dirname(os.path.realpath(__file__)))")
-
 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(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 ba47e04b643a5d..1f7a876e9cdbc2 100644
--- a/ports/hpx/vcpkg.json
+++ b/ports/hpx/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "hpx",
   "version": "1.8.0",
-  "port-version": 1,
+  "port-version": 2,
   "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 8215bf817de877..287edee6365b0e 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2894,7 +2894,7 @@
     },
     "hpx": {
       "baseline": "1.8.0",
-      "port-version": 1
+      "port-version": 2
     },
     "http-parser": {
       "baseline": "2.9.4",
diff --git a/versions/h-/hpx.json b/versions/h-/hpx.json
index 1bdd4bc4647c3d..7334a4957067fa 100644
--- a/versions/h-/hpx.json
+++ b/versions/h-/hpx.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "65b93e6c2b9660897d82d6dd32c0edb6689aa6e6",
+      "version": "1.8.0",
+      "port-version": 2
+    },
     {
       "git-tree": "aaf58e8627662fd841d011ea7e71d23507573772",
       "version": "1.8.0",