[vcpkg baseline][yasm/vcpkg-tool-ninja] Fix build (#25678)

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

* version
This commit is contained in:
Jack·Boos·Yu 2022-07-11 23:24:23 +00:00 committed by GitHub
parent dbb8930ca3
commit 7f49d67ef8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 31 additions and 4 deletions

View File

@ -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}")

View File

@ -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}

View File

@ -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",

View File

@ -33,6 +33,7 @@ vcpkg_cmake_configure(
OPTIONS
${FEATURE_OPTIONS}
${HOST_TOOLS_OPTIONS}
"-DPYTHON_EXECUTABLE=${PYTHON3}"
-DENABLE_NLS=OFF
-DYASM_BUILD_TESTS=OFF
)

View File

@ -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",

View File

@ -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",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "e4dafd8bf3868653e8e4fa81340dfeaea288a43c",
"version-date": "2022-03-31",
"port-version": 1
},
{
"git-tree": "0d55ba6e9ede00479127566b8f39fce7034e1b05",
"version-date": "2022-03-31",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "e9ad958de17f5b7661720dc322cff96b2dff8355",
"version": "1.3.0",
"port-version": 5
},
{
"git-tree": "796bb1f691c8ef8b04eb6577e95ab04167470dac",
"version": "1.3.0",