[yasm-tool] Migrate to Host Dependencies (#16478)

* [yasm-tool] Fix usage of port to be host dependencies

This allows mpg123, nettle, and gmp to support non-x86 windows manifest mode

* fix gmp

* oops

* versions update

4 files changed, 9 insertions, 39 deletions

diff --git a/ports/yasm-tool-helper/portfile.cmake b/ports/yasm-tool-helper/portfile.cmake
index 072b7894f..91f4fc738 100644
--- a/ports/yasm-tool-helper/portfile.cmake
+++ b/ports/yasm-tool-helper/portfile.cmake
@@ -1,2 +1,5 @@
-set(VCPKG_POLICY_EMPTY_PACKAGE enabled)

-configure_file(${CMAKE_CURRENT_LIST_DIR}/yasm-tool-helper.cmake ${CURRENT_PACKAGES_DIR}/share/yasm-tool-helper/yasm-tool-helper.cmake COPYONLY)

+set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
+configure_file(
+    "${CMAKE_CURRENT_LIST_DIR}/yasm-tool-helper.cmake.in"
+    "${CURRENT_PACKAGES_DIR}/share/${PORT}/yasm-tool-helper.cmake"
+    @ONLY)
diff --git a/ports/yasm-tool-helper/vcpkg.json b/ports/yasm-tool-helper/vcpkg.json
index b37b33c22..72e1fba3b 100644
--- a/ports/yasm-tool-helper/vcpkg.json
+++ b/ports/yasm-tool-helper/vcpkg.json
@@ -1,12 +1,12 @@
 {
   "name": "yasm-tool-helper",
-  "version-string": "2020-10-12",
-  "description": "This port provides helper functions for ports needing to consume YASM",
+  "version-string": "2020-03-11",
+  "description": "Backfill that depends on yasm-tool:host",
   "homepage": "https://github.com/Microsoft/vcpkg",
   "dependencies": [
     {
       "name": "yasm-tool",
-      "platform": "x86 & windows"
+      "host": true
     }
   ]
 }
diff --git a/ports/yasm-tool-helper/yasm-tool-helper.cmake b/ports/yasm-tool-helper/yasm-tool-helper.cmake
deleted file mode 100644
index 24c44c9d0..000000000
--- a/ports/yasm-tool-helper/yasm-tool-helper.cmake
+++ /dev/null
@@ -1,34 +0,0 @@
-function(yasm_tool_helper)

-    cmake_parse_arguments(PARSE_ARGV 0 a

-        "APPEND_TO_PATH;PREPEND_TO_PATH"

-        "OUT_VAR"

-        ""

-    )

-

-    if(CMAKE_HOST_WIN32)

-        if(VCPKG_TARGET_ARCHITECTURE MATCHES "x86" AND VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_UWP)

-            # Native compilation

-            set(YASM "${CURRENT_INSTALLED_DIR}/tools/yasm-tool/yasm.exe")

-        else()

-            # Cross compilation

-            get_filename_component(YASM "${CURRENT_INSTALLED_DIR}/../x86-windows/tools/yasm-tool/yasm.exe" ABSOLUTE)

-            if(NOT EXISTS "${YASM}")

-                message(FATAL_ERROR "Cross-targetting and x64 ports requiring yasm require the x86-windows yasm-tool to be available. Please install yasm-tool:x86-windows first.")

-            endif()

-        endif()

-    else()

-        vcpkg_find_acquire_program(YASM)

-    endif()

-

-    if(a_APPEND_TO_PATH)

-        get_filename_component(YASM_EXE_PATH ${YASM} DIRECTORY)

-        vcpkg_add_to_path("${YASM_EXE_PATH}")

-    endif()

-    if(a_PREPEND_TO_PATH)

-        get_filename_component(YASM_EXE_PATH ${YASM} DIRECTORY)

-        vcpkg_add_to_path(PREPEND "${YASM_EXE_PATH}")

-    endif()

-    if(a_OUT_VAR)

-        set(${a_OUT_VAR} "${YASM}" PARENT_SCOPE)

-    endif()

-endfunction()

diff --git a/ports/yasm-tool-helper/yasm-tool-helper.cmake.in b/ports/yasm-tool-helper/yasm-tool-helper.cmake.in
new file mode 100644
index 000000000..48bd805f3
--- /dev/null
+++ b/ports/yasm-tool-helper/yasm-tool-helper.cmake.in
@@ -0,0 +1 @@
+include("${CMAKE_CURRENT_LIST_DIR}/../../../@HOST_TRIPLET@/share/yasm-tool/vcpkg-port-config.cmake")