mirror of https://github.com/microsoft/vcpkg.git
[llfio,outcome,status-code,ned14-internal-quickcpplib] Update to 2026-04-29 (#51455)
This commit is contained in:
parent
8ec6e47350
commit
aa173a9396
|
|
@ -8,8 +8,8 @@ endif()
|
|||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO ned14/llfio
|
||||
REF 52560148e7e199675a38ab5669d172a3db6a5c94
|
||||
SHA512 a13c8c3340b871f492b1a9eab087ff0ff16d7bee2e3fb3b6539d34efdc3e286920f89283f4df48a79f716803b58abf389ab379bc08838b65d6f5f05455505492
|
||||
REF b3c9308f143e27161c40f6d52a8fd18e8f05761b
|
||||
SHA512 eb1b629b00fc28da939b0766ce567896da098401d71bd65b895f34ccd805d5ac99c0e45cc1733e63ce985c22b6d2118e576fb49a8e3a6f02170b9fe378e801bd
|
||||
HEAD_REF develop
|
||||
)
|
||||
|
||||
|
|
@ -38,11 +38,13 @@ if(VCPKG_TARGET_IS_WINDOWS AND (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPK
|
|||
endif()
|
||||
# setting CMAKE_CXX_STANDARD here to prevent llfio from messing with compiler flags
|
||||
# the cmake package config requires said C++ standard target transitively via quickcpplib
|
||||
if ("cxx20" IN_LIST FEATURES)
|
||||
list(APPEND extra_config -DCMAKE_CXX_STANDARD=20)
|
||||
elseif("cxx17" IN_LIST FEATURES)
|
||||
if ("polyfill-cxx20" IN_LIST FEATURES)
|
||||
list(APPEND extra_config -DCMAKE_CXX_STANDARD=17)
|
||||
endif()
|
||||
if (VCPKG_CROSSCOMPILING)
|
||||
# try_run() is not supported when cross-compiling
|
||||
list(APPEND extra_config -DCXX_HAS_CXX17_FILESYSTEM=ON)
|
||||
endif()
|
||||
|
||||
# quickcpplib parses CMAKE_MSVC_RUNTIME_LIBRARY and cannot support the default crt linkage generator expression from vcpkg
|
||||
if(VCPKG_TARGET_IS_WINDOWS)
|
||||
|
|
@ -59,12 +61,10 @@ vcpkg_cmake_configure(
|
|||
-Dllfio_IS_DEPENDENCY=On
|
||||
"-DCMAKE_PREFIX_PATH=${CURRENT_INSTALLED_DIR}"
|
||||
${LLFIO_FEATURE_OPTIONS}
|
||||
-DLLFIO_FORCE_OPENSSL_OFF=ON
|
||||
-DLLFIO_ENABLE_DEPENDENCY_SMOKE_TEST=ON # Leave this always on to test everything compiles
|
||||
-DCMAKE_DISABLE_FIND_PACKAGE_Git=ON
|
||||
-DCXX_CONCEPTS_FLAGS=
|
||||
-DCXX_COROUTINES_FLAGS=
|
||||
-DCMAKE_POLICY_DEFAULT_CMP0091=NEW # MSVC <filesystem> detection fails without this
|
||||
${extra_config}
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "llfio",
|
||||
"version-date": "2025-01-13",
|
||||
"version-date": "2026-04-29",
|
||||
"maintainers": [
|
||||
"Niall Douglas <s_github@nedprod.com>",
|
||||
"Henrik Gaßmann <henrik@gassmann.onl>"
|
||||
|
|
@ -21,34 +21,9 @@
|
|||
}
|
||||
],
|
||||
"features": {
|
||||
"polyfill-cxx17": {
|
||||
"description": "Polyfill C++17 entities",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "llfio",
|
||||
"default-features": false,
|
||||
"features": [
|
||||
"polyfill-cxx20"
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "ned14-internal-quickcpplib",
|
||||
"default-features": false,
|
||||
"features": [
|
||||
"polyfill-cxx17"
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "outcome",
|
||||
"default-features": false,
|
||||
"features": [
|
||||
"polyfill-cxx17"
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
"polyfill-cxx20": {
|
||||
"description": "Polyfill C++20 entities",
|
||||
"supports": "!android",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "ned14-internal-quickcpplib",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
set(QUICKCPPLIB_REF 40b0964df509e90a4b527243a8fd4dbf6b704ff2)
|
||||
set(QUICKCPPLIB_SHA512 ccec956a7d9a911678fe6ef3be05a41bbdc70ce88fd04724417af86fc7b5785eeeb5301a3276914e0f49a364c1747b5cbcb3bf58871f224660155c0debc20481)
|
||||
set(QUICKCPPLIB_REF 3c1d8cb5e94722447e4f17e87b5a9e3a0c66fb39)
|
||||
set(QUICKCPPLIB_SHA512 821e75eab2f3d0c42f0c8e9b1aab5c4f6b9e238d20cd0a96ab4b1011de748606704da0847c373555430453a3491dec9bdf316123ea51e4bccba98f7e14f022ef)
|
||||
|
||||
set(OPTIONAL_REF 2b43315458a99fc5de1da6e7bc0ddd364b26d643)
|
||||
set(OPTIONAL_SHA512 1952386cd3c7b963861f9634055e1baa4181d398d6f1b068a8a3f411368432bdcd42e47aadfa856584ed9a7c724a1c83369243ccb653e650af5c9155b42a84f4)
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "ned14-internal-quickcpplib",
|
||||
"version-date": "2025-12-16",
|
||||
"version-date": "2026-04-29",
|
||||
"maintainers": [
|
||||
"Niall Douglas <s_github@nedprod.com>",
|
||||
"Henrik Gaßmann <henrik@gassmann.onl>"
|
||||
|
|
|
|||
|
|
@ -1,8 +1,7 @@
|
|||
diff --git a/cmake/headers.cmake b/cmake/headers.cmake
|
||||
index 734e7d0..5d0f646 100644
|
||||
--- a/cmake/headers.cmake
|
||||
+++ b/cmake/headers.cmake
|
||||
@@ -25,32 +25,6 @@ set(outcome_HEADERS
|
||||
@@ -25,47 +25,10 @@ set(outcome_HEADERS
|
||||
"include/outcome/detail/version.hpp"
|
||||
"include/outcome/experimental/coroutine_support.hpp"
|
||||
"include/outcome/experimental/result.h"
|
||||
|
|
@ -31,7 +30,22 @@ index 734e7d0..5d0f646 100644
|
|||
- "include/outcome/experimental/status-code/include/status-code/system_code_from_exception.hpp"
|
||||
- "include/outcome/experimental/status-code/include/status-code/system_error2.hpp"
|
||||
- "include/outcome/experimental/status-code/include/status-code/win32_code.hpp"
|
||||
- "include/outcome/experimental/status-code/single-header/system_error2.hpp"
|
||||
"include/outcome/experimental/status-code/single-header/system_error2-nowindows.hpp"
|
||||
"include/outcome/experimental/status-code/single-header/system_error2.hpp"
|
||||
"include/outcome/experimental/status_outcome.hpp"
|
||||
"include/outcome/experimental/status_result.hpp"
|
||||
- "include/outcome/experimental/wg14_result/include/wg14_result/all.h"
|
||||
- "include/outcome/experimental/wg14_result/include/wg14_result/all.hpp"
|
||||
- "include/outcome/experimental/wg14_result/include/wg14_result/config.h"
|
||||
- "include/outcome/experimental/wg14_result/include/wg14_result/result.h"
|
||||
- "include/outcome/experimental/wg14_result/include/wg14_result/status_code.h"
|
||||
- "include/outcome/experimental/wg14_result/include/wg14_result/status_code_domain.h"
|
||||
- "include/outcome/experimental/wg14_result/include/wg14_result/status_code_generic.h"
|
||||
- "include/outcome/experimental/wg14_result/include/wg14_result/status_code_posix.h"
|
||||
- "include/outcome/experimental/wg14_result/include/wg14_result/status_code_system.h"
|
||||
- "include/outcome/experimental/wg14_result/include/wg14_result/try.h"
|
||||
- "include/outcome/experimental/wg14_result/test/test_common.h"
|
||||
- "include/outcome/experimental/wg14_result/test/ticks_clock.h"
|
||||
"include/outcome/iostream_support.hpp"
|
||||
"include/outcome/iostream_support_result.hpp"
|
||||
"include/outcome/outcome.hpp"
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ vcpkg_from_github(
|
|||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO ned14/outcome
|
||||
REF v${VERSION}
|
||||
SHA512 41d169d625ff9374e7eef228384cd80b6881fc46ed580b259995fa1c70d1add260afc6cf409d1e43b9ab30583781dcd833a21186a3d7f1fe42fa7211ab1c2375
|
||||
SHA512 049c5052dd3bd25d7455a9a9c68a39096a2b877f64e21308520005b00411aaa47304505f68502c693aabdc271d12afd533d77245ed6c6c5249002844d403e684
|
||||
HEAD_REF develop
|
||||
PATCHES
|
||||
fix-status-code-path.patch
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "outcome",
|
||||
"version": "2.2.14",
|
||||
"version": "2.2.15",
|
||||
"maintainers": [
|
||||
"Niall Douglas <s_github@nedprod.com>",
|
||||
"Henrik Gaßmann <henrik@gassmann.onl>"
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO ned14/status-code
|
||||
REF 525e324b1b85fbd1bf74046d760068b7e27b8cda
|
||||
SHA512 c70a33558e7399aff5d069ddd032ed5896ab2f0075bc864f12f335c1e7023be95503f5ee9dec481fd30b2fbb72611847e50653113a77aa4032121f87f6eb8377
|
||||
REF 937b0fc71c85dcae77059f4a3bec6424fdf1b5f9
|
||||
SHA512 f0d71b0a6982261fcb41f75cdb49c035fac00a5cd9e61b706c606dc255775c48af2ba15772c19330cf5497e787af6c455b097233554f3f2d2ffd72a9fb79a08c
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
)
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "status-code",
|
||||
"version-date": "2025-05-21",
|
||||
"version-date": "2026-04-29",
|
||||
"maintainers": [
|
||||
"Niall Douglas <s_github@nedprod.com>",
|
||||
"Henrik Gaßmann <henrik@gassmann.onl>"
|
||||
|
|
|
|||
|
|
@ -873,7 +873,6 @@ libva:arm64-linux=fail
|
|||
libxt:x64-windows-release=fail # Appears to have broken races
|
||||
libxt:x64-windows=fail
|
||||
liquid-dsp:arm64-linux=fail
|
||||
llfio:x64-android=fail
|
||||
llgl:arm-neon-android=fail
|
||||
llgl:arm64-android=fail
|
||||
llgl:x64-android=fail
|
||||
|
|
|
|||
|
|
@ -6065,7 +6065,7 @@
|
|||
"port-version": 0
|
||||
},
|
||||
"llfio": {
|
||||
"baseline": "2025-01-13",
|
||||
"baseline": "2026-04-29",
|
||||
"port-version": 0
|
||||
},
|
||||
"llgi": {
|
||||
|
|
@ -6889,7 +6889,7 @@
|
|||
"port-version": 0
|
||||
},
|
||||
"ned14-internal-quickcpplib": {
|
||||
"baseline": "2025-12-16",
|
||||
"baseline": "2026-04-29",
|
||||
"port-version": 0
|
||||
},
|
||||
"neko-event": {
|
||||
|
|
@ -7521,7 +7521,7 @@
|
|||
"port-version": 0
|
||||
},
|
||||
"outcome": {
|
||||
"baseline": "2.2.14",
|
||||
"baseline": "2.2.15",
|
||||
"port-version": 0
|
||||
},
|
||||
"p-ranav-csv": {
|
||||
|
|
@ -9597,7 +9597,7 @@
|
|||
"port-version": 0
|
||||
},
|
||||
"status-code": {
|
||||
"baseline": "2025-05-21",
|
||||
"baseline": "2026-04-29",
|
||||
"port-version": 0
|
||||
},
|
||||
"status-value-lite": {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "a7688669bc1d7181bb7faee5e8c8a933936b5727",
|
||||
"version-date": "2026-04-29",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "79adb348fb8078a09e4751f68192908083ffc305",
|
||||
"version-date": "2025-01-13",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "54df96187a8c41e26a2db2d6eb733d0f53eb304c",
|
||||
"version-date": "2026-04-29",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "d0e97b11ced1025d2747daa15953dd75afcbd997",
|
||||
"version-date": "2025-12-16",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "e589694c11420dd5ce6b730a43cbed4ab0042162",
|
||||
"version": "2.2.15",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "e8058098d0d865147179d1dd789ac2680ea5fe59",
|
||||
"version": "2.2.14",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "e617a8814efc2565b8251605dd36b2c60910b135",
|
||||
"version-date": "2026-04-29",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "59556b8577e215140d42304f0f02f776b1b59f99",
|
||||
"version-date": "2025-05-21",
|
||||
|
|
|
|||
Loading…
Reference in New Issue