From 906fc2a6a48228265ac732b72727d77d98e466d3 Mon Sep 17 00:00:00 2001
From: Eric Kilmer <eric.d.kilmer@gmail.com>
Date: Fri, 25 Mar 2022 16:36:39 -0400
Subject: [PATCH 1/2] Update vcpkg to latest commit

---
 vcpkg_info.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vcpkg_info.txt b/vcpkg_info.txt
index 7165a932..57956f96 100644
--- a/vcpkg_info.txt
+++ b/vcpkg_info.txt
@@ -1,2 +1,2 @@
 https://github.com/microsoft/vcpkg.git
-7e7dad5fe20cdc085731343e0e197a7ae655555b
+a76eb002a71b6cf7bad343f5e3376dfe6bb83c5c

From e04607cf087cd21e7770b2050d5bd2c946dcc0ca Mon Sep 17 00:00:00 2001
From: Eric Kilmer <eric.d.kilmer@gmail.com>
Date: Fri, 25 Mar 2022 16:38:37 -0400
Subject: [PATCH 2/2] Correctly pass all vcpkg flags to XED buildsystem

Now we build with the selected compiler instead of whatever mbuild was
picking up. We also correctly add the requested vcpkg flags, which
affects the sanitizer build(s).
---
 ports/xed/portfile.cmake | 13 ++++++++++---
 ports/xed/vcpkg.json     |  2 +-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/ports/xed/portfile.cmake b/ports/xed/portfile.cmake
index 4b261bb6..0bb6189e 100644
--- a/ports/xed/portfile.cmake
+++ b/ports/xed/portfile.cmake
@@ -4,7 +4,7 @@ vcpkg_from_github(
     REF 5976632eeaaaad7890c2109d0cfaf4012eaca3b8 # 12.0.1
     SHA512 9463e669cc273f55829e82d6032763221c2ba73f3c43191be847f694f6fd3609b866cc14101e8b1f88e7e44f04b4f5f7bf61bb9431b72b7e17ded1db34b7757d
     HEAD_REF master
-    PATCHES 
+    PATCHES
       dont_call_evex_scan_when_error.patch
 )
 
@@ -18,6 +18,13 @@ vcpkg_from_github(
     HEAD_REF master
 )
 
+# Xed has its own compiler detection, and will readily guess wrong.
+# Help it out by finding the correct compiler
+z_vcpkg_get_cmake_vars(cmake_vars_file)
+include("${cmake_vars_file}")
+message(STATUS "Detected CXX compiler: ${VCPKG_DETECTED_CMAKE_CXX_COMPILER}")
+message(STATUS "Detected C compiler: ${VCPKG_DETECTED_CMAKE_C_COMPILER}")
+
 # Copy mbuild sources.
 message(STATUS "Copying mbuild to parallel source directory...")
 file(COPY ${MBUILD_SOURCE_PATH}/ DESTINATION ${SOURCE_PATH}/../mbuild)
@@ -53,7 +60,7 @@ if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL release)
   file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET})
   file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET})
   vcpkg_execute_required_process(
-    COMMAND ${PYTHON3} ${SOURCE_PATH}/mfile.py install --${LINK_TYPE} --install-dir ${CURRENT_PACKAGES_DIR} --build-dir "${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET}" -j ${VCPKG_CONCURRENCY} "--extra-ccflags=${VCPKG_C_FLAGS} ${VCPKG_C_FLAGS_RELEASE} ${EXTRA_C_FLAGS_RELEASE}" "--extra-cxxflags=${VCPKG_CXX_FLAGS} ${VCPKG_CXX_FLAGS_RELEASE} ${EXTRA_CXX_FLAGS_RELEASE}" "--extra-linkflags=${VCPKG_LINKER_FLAGS} ${VCPKG_LINKER_FLAGS_RELEASE}" --verbose=9
+    COMMAND ${PYTHON3} ${SOURCE_PATH}/mfile.py install "--cc=${VCPKG_DETECTED_CMAKE_C_COMPILER}" "--cxx=${VCPKG_DETECTED_CMAKE_CXX_COMPILER}" --${LINK_TYPE} --install-dir ${CURRENT_PACKAGES_DIR} --build-dir "${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET}" -j ${VCPKG_CONCURRENCY} "--extra-ccflags=${VCPKG_DETECTED_CMAKE_C_FLAGS} ${VCPKG_DETECTED_CMAKE_C_FLAGS_RELEASE} ${EXTRA_C_FLAGS_RELEASE}" "--extra-cxxflags=${VCPKG_DETECTED_CMAKE_CXX_FLAGS} ${VCPKG_DETECTED_CMAKE_CXX_FLAGS_RELEASE} ${EXTRA_CXX_FLAGS_RELEASE}" "--extra-linkflags=${VCPKG_DETECTED_CMAKE_LINKER_FLAGS} ${VCPKG_DETECTED_CMAKE_LINKER_FLAGS_RELEASE}" --verbose=9
     WORKING_DIRECTORY ${SOURCE_PATH}
     LOGNAME python-${TARGET_TRIPLET}-build-install-rel
   )
@@ -75,7 +82,7 @@ if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL debug)
   file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${DEBUG_TRIPLET})
   file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${DEBUG_TRIPLET})
   vcpkg_execute_required_process(
-    COMMAND ${PYTHON3} ${SOURCE_PATH}/mfile.py install --debug --${LINK_TYPE} --install-dir ${CURRENT_PACKAGES_DIR}/debug --build-dir "${CURRENT_BUILDTREES_DIR}/${DEBUG_TRIPLET}" -j ${VCPKG_CONCURRENCY} "--extra-ccflags=${VCPKG_C_FLAGS} ${VCPKG_C_FLAGS_DEBUG} ${EXTRA_C_FLAGS_DEBUG}" "--extra-cxxflags=${VCPKG_CXX_FLAGS} ${VCPKG_CXX_FLAGS_DEBUG} ${EXTRA_CXX_FLAGS_DEBUG}" "--extra-linkflags=${VCPKG_LINKER_FLAGS} ${VCPKG_LINKER_FLAGS_DEBUG}" --verbose=9
+    COMMAND ${PYTHON3} ${SOURCE_PATH}/mfile.py install "--cc=${VCPKG_DETECTED_CMAKE_C_COMPILER}" "--cxx=${VCPKG_DETECTED_CMAKE_CXX_COMPILER}" --debug --${LINK_TYPE} --install-dir ${CURRENT_PACKAGES_DIR}/debug --build-dir "${CURRENT_BUILDTREES_DIR}/${DEBUG_TRIPLET}" -j ${VCPKG_CONCURRENCY} "--extra-ccflags=${VCPKG_DETECTED_CMAKE_C_FLAGS} ${VCPKG_DETECTED_CMAKE_C_FLAGS_DEBUG} ${EXTRA_C_FLAGS_DEBUG}" "--extra-cxxflags=${VCPKG_DETECTED_CMAKE_CXX_FLAGS} ${VCPKG_DETECTED_CMAKE_CXX_FLAGS_DEBUG} ${EXTRA_CXX_FLAGS_DEBUG}" "--extra-linkflags=${VCPKG_DETECTED_CMAKE_LINKER_FLAGS} ${VCPKG_DETECTED_CMAKE_LINKER_FLAGS_DEBUG}" --verbose=9
     WORKING_DIRECTORY ${SOURCE_PATH}
     LOGNAME python-${TARGET_TRIPLET}-build-install-dbg
   )
diff --git a/ports/xed/vcpkg.json b/ports/xed/vcpkg.json
index 39f4d367..c90526c3 100644
--- a/ports/xed/vcpkg.json
+++ b/ports/xed/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "xed",
   "version-string": "12.0.1",
-  "port-version": 1,
+  "port-version": 2,
   "description": "x86 encoder decoder",
   "homepage": "https://intelxed.github.io/"
 }