From 7f49d67ef8e43bf95c3a14403126c5aaa9e054b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?=
 <47264268+JackBoosY@users.noreply.github.com>
Date: Mon, 11 Jul 2022 23:24:23 +0000
Subject: [PATCH] [vcpkg baseline][yasm/vcpkg-tool-ninja] Fix build (#25678)

* [yasm/vcpkg-tool-ninja] Fix build

* version
---
 ports/vcpkg-tool-ninja/portfile.cmake          |  4 +++-
 ports/vcpkg-tool-ninja/use-internal-re2c.patch | 13 +++++++++++++
 ports/vcpkg-tool-ninja/vcpkg.json              |  1 +
 ports/yasm/portfile.cmake                      |  1 +
 ports/yasm/vcpkg.json                          |  2 +-
 versions/baseline.json                         |  4 ++--
 versions/v-/vcpkg-tool-ninja.json              |  5 +++++
 versions/y-/yasm.json                          |  5 +++++
 8 files changed, 31 insertions(+), 4 deletions(-)
 create mode 100644 ports/vcpkg-tool-ninja/use-internal-re2c.patch

diff --git a/ports/vcpkg-tool-ninja/portfile.cmake b/ports/vcpkg-tool-ninja/portfile.cmake
index 8cb941b47b..eb4ef16dfb 100644
--- a/ports/vcpkg-tool-ninja/portfile.cmake
+++ b/ports/vcpkg-tool-ninja/portfile.cmake
@@ -13,7 +13,9 @@ vcpkg_from_github(
     REF 170c387a7461d476523ae29c115a58f16e4d3430
     SHA512 75c0f263ad325d14c99c9a1d85e571832407b481271a2733e78183a478f7ecd22d84451fc8d7ce16ab20d641ce040761d7ab266695d66bbac5b2b9a3a29aa521
     HEAD_REF master
-    PATCHES "${LONG_PATH_PATCH}" # Long path support windows
+    PATCHES
+        "${LONG_PATH_PATCH}" # Long path support windows
+        use-internal-re2c.patch
 )
 set(VCPKG_BUILD_TYPE release) #we only need release here!
 vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}")
diff --git a/ports/vcpkg-tool-ninja/use-internal-re2c.patch b/ports/vcpkg-tool-ninja/use-internal-re2c.patch
new file mode 100644
index 0000000000..0b83263213
--- /dev/null
+++ b/ports/vcpkg-tool-ninja/use-internal-re2c.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 42094d2..d4eda66 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -43,7 +43,7 @@ endif()
+ 
+ # --- optional re2c
+ find_program(RE2C re2c)
+-if(RE2C)
++if(0)
+ 	# the depfile parser and ninja lexers are generated using re2c.
+ 	function(re2c IN OUT)
+ 		add_custom_command(DEPENDS ${IN} OUTPUT ${OUT}
diff --git a/ports/vcpkg-tool-ninja/vcpkg.json b/ports/vcpkg-tool-ninja/vcpkg.json
index 434990e25f..e1eac61206 100644
--- a/ports/vcpkg-tool-ninja/vcpkg.json
+++ b/ports/vcpkg-tool-ninja/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "vcpkg-tool-ninja",
   "version-date": "2022-03-31",
+  "port-version": 1,
   "description": "Ninja is a small build system with a focus on speed.",
   "homepage": "https://ninja-build.org/",
   "license": "Apache-2.0",
diff --git a/ports/yasm/portfile.cmake b/ports/yasm/portfile.cmake
index 4a69f7c24f..966a9f8f2b 100644
--- a/ports/yasm/portfile.cmake
+++ b/ports/yasm/portfile.cmake
@@ -33,6 +33,7 @@ vcpkg_cmake_configure(
     OPTIONS
         ${FEATURE_OPTIONS}
         ${HOST_TOOLS_OPTIONS}
+        "-DPYTHON_EXECUTABLE=${PYTHON3}"
         -DENABLE_NLS=OFF
         -DYASM_BUILD_TESTS=OFF
 )
diff --git a/ports/yasm/vcpkg.json b/ports/yasm/vcpkg.json
index 284d4f5cdf..b0bd940589 100644
--- a/ports/yasm/vcpkg.json
+++ b/ports/yasm/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "yasm",
   "version": "1.3.0",
-  "port-version": 4,
+  "port-version": 5,
   "description": "Yasm is a complete rewrite of the NASM assembler under the new BSD License.",
   "homepage": "https://github.com/yasm/yasm",
   "license": "BSD-2-Clause OR BSD-3-Clause OR Artistic-1.0 OR GPL-2.0-only OR LGPL-2.0-only",
diff --git a/versions/baseline.json b/versions/baseline.json
index b062c23249..22fb454b32 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -7454,7 +7454,7 @@
     },
     "vcpkg-tool-ninja": {
       "baseline": "2022-03-31",
-      "port-version": 0
+      "port-version": 1
     },
     "vcpkg-tool-nodejs": {
       "baseline": "14.17.4",
@@ -7762,7 +7762,7 @@
     },
     "yasm": {
       "baseline": "1.3.0",
-      "port-version": 4
+      "port-version": 5
     },
     "yasm-tool": {
       "baseline": "2021-12-14",
diff --git a/versions/v-/vcpkg-tool-ninja.json b/versions/v-/vcpkg-tool-ninja.json
index 643a736c0a..989abb5d86 100644
--- a/versions/v-/vcpkg-tool-ninja.json
+++ b/versions/v-/vcpkg-tool-ninja.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "e4dafd8bf3868653e8e4fa81340dfeaea288a43c",
+      "version-date": "2022-03-31",
+      "port-version": 1
+    },
     {
       "git-tree": "0d55ba6e9ede00479127566b8f39fce7034e1b05",
       "version-date": "2022-03-31",
diff --git a/versions/y-/yasm.json b/versions/y-/yasm.json
index 3d6a299e3f..2611a7bf6b 100644
--- a/versions/y-/yasm.json
+++ b/versions/y-/yasm.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "e9ad958de17f5b7661720dc322cff96b2dff8355",
+      "version": "1.3.0",
+      "port-version": 5
+    },
     {
       "git-tree": "796bb1f691c8ef8b04eb6577e95ab04167470dac",
       "version": "1.3.0",