[llfio,ned14-internal-quickcpplib,outcome,status-code] Update to 2023-11-06 (#34935)

* [ned14-internal-quickcpplib] Update to 2023-11-06 * [status-code] Update to 2023-11-0 * [outcome] Update to 2.2.7 * [llfio] Update to 2023-11-06 * Update version database * [outcome,llfio] Fix find_dependency usage
2023-11-14 22:11:02 +01:00 · 2023-11-14 22:11:02 +01:00 · 426dcc68e0
parent a3aec9d93b
commit 426dcc68e0
17 changed files with 56 additions and 130 deletions
--- a/ports/llfio/portfile.cmake
+++ b/ports/llfio/portfile.cmake
@ -8,8 +8,8 @@ endif()
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO ned14/llfio
-    REF b588deb7593d62e3afc025f85477d09b8012fb90
-    SHA512 47b43c716406d2847b16c33730376dc2a98ad8d079319387087ba4b37fdf5623c660fc53c92e2f90995a877001a7a739985d15d0b5133e079254e2d85ba5d8e4
+    REF aa2be6c0db56b4164837d3bc20938785dea7419d
+    SHA512 37ebb7ad87cd5c6eedad25221ee34809587fd18245b3c6af56fa64f165d46e826310c66f61ad7e1ab6bfab9cf9331dc51ea08389b9adea11b1225f3fc63f0240
    HEAD_REF develop
    PATCHES
 )
@ -17,8 +17,8 @@ vcpkg_from_github(
 vcpkg_from_github(
    OUT_SOURCE_PATH NTKEC_SOURCE_PATH
    REPO ned14/ntkernel-error-category
-    REF bbd44623594142155d49bd3ce8820d3cf9da1e1e
-    SHA512 589d3bc7bca98ca8d05ce9f5cf009dd98b8884bdf3739582f2f6cbf5a324ce95007ea041450ed935baa4a401b4a0242c181fb6d2dcf7ad91587d75f05491f50e
+    REF 278b90e2c7bb07e70d155ad8c7b904188280b7dc
+    SHA512 a0e35fb196085012da0299d0dc456e70f4d4044144bc720f24c9a0ac1483724c137ef89740dc65821d135ca070650775a6802c0b21b24703a93d4ef60a30ffdb
    HEAD_REF master
 )

@ -35,7 +35,7 @@ file(RENAME "${NTKEC_SOURCE_PATH}" "${SOURCE_PATH}/include/llfio/ntkernel-error-
 set(extra_config)
 # cmake does not correctly set CMAKE_SYSTEM_PROCESSOR when targeting ARM on Windows
 if(VCPKG_TARGET_IS_WINDOWS AND (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64"))
-  list(APPEND extra_config -DLLFIO_ASSUME_CROSS_COMPILING=On)
+  list(APPEND extra_config -DLLFIO_ASSUME_CROSS_COMPILING=ON)
 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
@ -57,14 +57,15 @@ endif()
 vcpkg_cmake_configure(
    SOURCE_PATH "${SOURCE_PATH}"
    OPTIONS
-        -DPROJECT_IS_DEPENDENCY=On
-        -Dquickcpplib_DIR=${CURRENT_INSTALLED_DIR}/share/quickcpplib
+        -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}
 )

@ -83,8 +84,9 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/llfio)
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")

 if("status-code" IN_LIST FEATURES)
-    file(INSTALL "${CURRENT_PORT_DIR}/usage-status-code-${VCPKG_LIBRARY_LINKAGE}" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+    set(_USAGE_FEATURE "status-code")
 else()
-    file(INSTALL "${CURRENT_PORT_DIR}/usage-error-code-${VCPKG_LIBRARY_LINKAGE}" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+    set(_USAGE_FEATURE "error-code")
 endif()
+file(INSTALL "${CURRENT_PORT_DIR}/usage-${_USAGE_FEATURE}-${VCPKG_LIBRARY_LINKAGE}" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME usage)
 vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/Licence.txt")
--- a/ports/llfio/vcpkg.json
+++ b/ports/llfio/vcpkg.json
@ -1,7 +1,6 @@
 {
  "name": "llfio",
-  "version-date": "2023-03-13",
-  "port-version": 1,
+  "version-date": "2023-11-06",
  "maintainers": [
    "Niall Douglas <s_github@nedprod.com>",
    "Henrik Gaßmann <henrik@gassmann.onl>"
--- a/ports/ned14-internal-quickcpplib/portfile.cmake
+++ b/ports/ned14-internal-quickcpplib/portfile.cmake
@ -39,16 +39,6 @@ vcpkg_from_github(
        quicklib-depheaders.patch
 )

-# Quickcpplib deploys subsets of the dependency headers into a private subdirectory
-if (NOT QUICKCPPLIB_REQUIRE_CXX17)
-    file(COPY "${CURRENT_INSTALLED_DIR}/include/nonstd/byte.hpp"
-        DESTINATION "${SOURCE_PATH}/include/quickcpplib/byte/include/nonstd")
-endif()
-if (NOT QUICKCPPLIB_REQUIRE_CXX20)
-    file(COPY "${CURRENT_INSTALLED_DIR}/include/nonstd/span.hpp"
-        DESTINATION "${SOURCE_PATH}/include/quickcpplib/span-lite/include/nonstd")
-endif()
-
 vcpkg_from_github(
    OUT_SOURCE_PATH OPT_SOURCE_PATH
    REPO akrzemi1/Optional
@ -66,7 +56,9 @@ set(VCPKG_BUILD_TYPE release)
 vcpkg_cmake_configure(
    SOURCE_PATH "${SOURCE_PATH}"
    OPTIONS
-        -DPROJECT_IS_DEPENDENCY=On
+        -Dquickcpplib_IS_DEPENDENCY=ON
+        -DQUICKCPPLIB_USE_SYSTEM_BYTE_LITE=ON
+        -DQUICKCPPLIB_USE_SYSTEM_SPAN_LITE=ON
        -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON
        -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON
        "-DCMAKE_INSTALL_DATADIR=${CURRENT_PACKAGES_DIR}/share/ned14-internal-quickcpplib"
@ -77,20 +69,6 @@ vcpkg_cmake_configure(

 vcpkg_cmake_install()

-if (QUICKCPPLIB_REQUIRE_CXX17)
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/quickcpplib/byte.hpp" "#if QUICKCPPLIB_USE_STD_BYTE" "#if 1")
-else ()
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/quickcpplib/byte.hpp" "#if QUICKCPPLIB_USE_STD_BYTE" "#if 0")
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/quickcpplib/byte.hpp" "#include \"byte/include/nonstd/byte.hpp\"" "#include <nonstd/byte.hpp>")
-endif()
-if (QUICKCPPLIB_REQUIRE_CXX20)
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/quickcpplib/span.hpp" "#ifdef QUICKCPPLIB_USE_STD_SPAN" "#if 1")
-else ()
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/quickcpplib/span.hpp" "#ifdef QUICKCPPLIB_USE_STD_SPAN" "#if 0")
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/quickcpplib/span.hpp" "#elif(_HAS_CXX20 || __cplusplus >= 202002) && __has_include(<span>)" "#elif 0")
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/quickcpplib/span.hpp" "#include \"span-lite/include/nonstd/span.hpp\"" "#include <nonstd/span.hpp>")
-endif()
-
 vcpkg_cmake_config_fixup(
    PACKAGE_NAME quickcpplib
    CONFIG_PATH lib/cmake/quickcpplib
--- a/ports/ned14-internal-quickcpplib/sha_manifest.cmake
+++ b/ports/ned14-internal-quickcpplib/sha_manifest.cmake
@ -1,5 +1,5 @@
-set(QUICKCPPLIB_REF 79752ee52078003522dca492f98995b45d13d60c)
-set(QUICKCPPLIB_SHA512 fa0a1d0d33ab7001e47974469f1437abe8fb273b6b576f7e1da6a8d583b33b3786236a31f43a36d9822ffe3c59d062a441f857f476d0bfe175cccc9b5fdf2593)
+set(QUICKCPPLIB_REF 7ca9350ad6eac11ef80b472c33dbd44650b1c2f0)
+set(QUICKCPPLIB_SHA512 d3258590502c02bb3ff11eb26bc00004e7ab4bb886a77e5c91ce76546193f37aa665885b6484345df4361a8d0cece2236e7b77a112372f4db4d3ebd2be5fff32)

 set(OPTIONAL_REF 2b43315458a99fc5de1da6e7bc0ddd364b26d643)
 set(OPTIONAL_SHA512 1952386cd3c7b963861f9634055e1baa4181d398d6f1b068a8a3f411368432bdcd42e47aadfa856584ed9a7c724a1c83369243ccb653e650af5c9155b42a84f4)
--- a/ports/ned14-internal-quickcpplib/vcpkg.json
+++ b/ports/ned14-internal-quickcpplib/vcpkg.json
@ -1,6 +1,6 @@
 {
  "name": "ned14-internal-quickcpplib",
-  "version-date": "2023-03-13",
+  "version-date": "2023-11-06",
  "maintainers": [
    "Niall Douglas <s_github@nedprod.com>",
    "Henrik Gaßmann <henrik@gassmann.onl>"
--- a/ports/outcome/fix-find-library.patch
+++ b/ports/outcome/fix-find-library.patch
@ -1,41 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a292728cf4..5286b5e366 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -40,17 +40,6 @@ include(QuickCppLibRequireOutOfSourceBuild)
- include(QuickCppLibUtils)
- include(QuickCppLibPolicies)
- 
-if(OUTCOME_BUNDLE_EMBEDDED_STATUS_CODE)
-  ensure_git_subrepo("${CMAKE_CURRENT_SOURCE_DIR}/include/outcome/experimental/status-code/include" "https://github.com/ned14/status-code.git")
-else()
-  find_quickcpplib_library(status-code
-    GIT_REPOSITORY "https://github.com/ned14/status-code.git"
-    GIT_TAG "${OUTCOME_DEPENDENCY_STATUS_CODE_GIT_TAG}"
-    REQUIRED
-    IS_HEADER_ONLY
-  )
-endif()
-
- # Parse the version we tell cmake directly from the version header file
- ParseProjectVersionFromHpp("${CMAKE_CURRENT_SOURCE_DIR}/include/outcome/detail/version.hpp" VERSIONSTRING)
- # Sets the usual PROJECT_NAME etc
-@@ -99,8 +88,16 @@ else()
-     IS_HEADER_ONLY
-   )
- endif()
-if (NOT OUTCOME_BUNDLE_EMBEDDED_STATUS_CODE)
-  list_filter(${PROJECT_NAME}_HEADERS EXCLUDE REGEX /status-code/include/)
-+if(OUTCOME_BUNDLE_EMBEDDED_STATUS_CODE)
-+  ensure_git_subrepo("${CMAKE_CURRENT_SOURCE_DIR}/include/outcome/experimental/status-code/include" "https://github.com/ned14/status-code.git")
-+else()
-+  find_quickcpplib_library(status-code
-+    GIT_REPOSITORY "https://github.com/ned14/status-code.git"
-+    GIT_TAG "${OUTCOME_DEPENDENCY_STATUS_CODE_GIT_TAG}"
-+    REQUIRED
-+    IS_HEADER_ONLY
-+  )
-+  list_filter(${PROJECT_NAME}_HEADERS EXCLUDE REGEX include/outcome/experimental/status-code/)
- endif()
- 
- # Make an interface only library so dependent CMakeLists can bring in this header-only library
--- a/ports/outcome/fix-status-code-include.patch
+++ b/ports/outcome/fix-status-code-include.patch
@ -1,16 +0,0 @@
-diff --git a/include/outcome/experimental/coroutine_support.hpp b/include/outcome/experimental/coroutine_support.hpp
-index 21759ede58..6c4b152294 100644
--- a/include/outcome/experimental/coroutine_support.hpp
-+++ b/include/outcome/experimental/coroutine_support.hpp
-@@ -45,7 +45,11 @@ Distributed under the Boost Software License, Version 1.0.
-   OUTCOME_V2_NAMESPACE_END
- 
- #ifdef __cpp_exceptions
-+#if 0
- #include "status-code/include/system_code_from_exception.hpp"
-+#else
-+#include <status-code/system_code_from_exception.hpp>
-+#endif
- OUTCOME_V2_NAMESPACE_BEGIN
- namespace awaitables
- {
--- a/ports/outcome/portfile.cmake
+++ b/ports/outcome/portfile.cmake
@ -24,12 +24,10 @@ endif()
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO ned14/outcome
-    REF 90032f99503b4620f21d8160dc3af06fa343541f
-    SHA512 7eda0694098a118633c8ad0ef812f8b03db536548f51d1ca71ca98b9f9e445bcb24019cd4d1046da9215227ad85205c5b3631d0c66de6edc1fcc904b2d9e0e0f
+    REF v${VERSION}
+    SHA512 2057f2f967f7aad3f78d081c72130122c1f99b837ce23ec9de9bfe0cd0fc493ce7085071cb2a54a840252ba0d82e14d99d622c1e0fdf9a8a20f41e5f89fa4645
    HEAD_REF develop
    PATCHES
-        fix-find-library.patch # incorporated into upstream after 2.2.4
-        fix-status-code-include.patch # incorporated into upstream after 2.2.4
 )

 # Because outcome's deployed files are header-only, the debug build is not necessary
@ -39,10 +37,9 @@ set(VCPKG_BUILD_TYPE release)
 vcpkg_cmake_configure(
    SOURCE_PATH "${SOURCE_PATH}"
    OPTIONS
-        -DPROJECT_IS_DEPENDENCY=On
-        -Dquickcpplib_DIR=${CURRENT_INSTALLED_DIR}/share/quickcpplib
+        -Doutcome_IS_DEPENDENCY=ON
+        "-DCMAKE_PREFIX_PATH=${CURRENT_INSTALLED_DIR}"
        -DOUTCOME_BUNDLE_EMBEDDED_STATUS_CODE=OFF
-        -Dstatus-code_DIR=${CURRENT_INSTALLED_DIR}/share/status-code
        -DOUTCOME_ENABLE_DEPENDENCY_SMOKE_TEST=ON  # Leave this always on to test everything compiles
        -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON
        -DCXX_CONCEPTS_FLAGS=
--- a/ports/outcome/vcpkg.json
+++ b/ports/outcome/vcpkg.json
@ -1,7 +1,6 @@
 {
  "name": "outcome",
-  "version": "2.2.4",
-  "port-version": 1,
+  "version": "2.2.7",
  "maintainers": [
    "Niall Douglas <s_github@nedprod.com>",
    "Henrik Gaßmann <henrik@gassmann.onl>"
--- a/ports/status-code/add-missing-include.patch
+++ b/ports/status-code/add-missing-include.patch
@ -1,12 +0,0 @@
-diff --git a/wg21/file_io_error.cpp b/wg21/file_io_error.cpp
-index 41f23a1..fe69458 100644
--- a/wg21/file_io_error.cpp
-+++ b/wg21/file_io_error.cpp
-@@ -24,6 +24,7 @@ http://www.boost.org/LICENSE_1_0.txt)
- 
- #define _CRT_SECURE_NO_WARNINGS
- #include <stdio.h>  // for sprintf
-+#include <utility>  // for std::move
- 
- #include "status-code/system_error2.hpp"
- 
--- a/ports/status-code/portfile.cmake
+++ b/ports/status-code/portfile.cmake
@ -1,11 +1,10 @@
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO ned14/status-code
-    REF 5be338838d278e730b78c07f6306ae71f6c1959c
-    SHA512 61685b7ba40fd2e8a985a8135065b335655aac7aee7778ca3317004c9730078361cfa4bd1b9ac2f9002efc707bfb6168c0275f11e0c5a6b079d42c8240528a90
+    REF 63b229c756202525d1c90d21706fdfb744096220
+    SHA512 610b40b6a967fcce9494478d4518e2529be328ce2aaccbedab8d2264d19d2791e427f51b48886fceacafecf74f24a3d25a9dd54697d375bdc8414521cce579a5
    HEAD_REF master
    PATCHES
-        add-missing-include.patch
 )

 # Because status-code's deployed files are header-only, the debug build is not necessary
@ -14,8 +13,10 @@ set(VCPKG_BUILD_TYPE release)
 vcpkg_cmake_configure(
    SOURCE_PATH "${SOURCE_PATH}"
    OPTIONS
-        -DPROJECT_IS_DEPENDENCY=On
+        -Dstatus-code_IS_DEPENDENCY=ON
        -DCMAKE_DISABLE_FIND_PACKAGE_Boost=ON
+    MAYBE_UNUSED_VARIABLES
+        CMAKE_DISABLE_FIND_PACKAGE_Boost
 )

 vcpkg_cmake_install()
--- a/ports/status-code/vcpkg.json
+++ b/ports/status-code/vcpkg.json
@ -1,7 +1,6 @@
 {
  "name": "status-code",
-  "version-date": "2023-01-27",
-  "port-version": 2,
+  "version-date": "2023-11-06",
  "maintainers": [
    "Niall Douglas <s_github@nedprod.com>",
    "Henrik Gaßmann <henrik@gassmann.onl>"
--- a/versions/baseline.json
+++ b/versions/baseline.json
@ -5181,8 +5181,8 @@
      "port-version": 0
    },
    "llfio": {
-      "baseline": "2023-03-13",
-      "port-version": 1
+      "baseline": "2023-11-06",
+      "port-version": 0
    },
    "llgl": {
      "baseline": "2023-03-05",
@ -5861,7 +5861,7 @@
      "port-version": 1
    },
    "ned14-internal-quickcpplib": {
-      "baseline": "2023-03-13",
+      "baseline": "2023-11-06",
      "port-version": 0
    },
    "neon2sse": {
@ -6385,8 +6385,8 @@
      "port-version": 0
    },
    "outcome": {
-      "baseline": "2.2.4",
-      "port-version": 1
+      "baseline": "2.2.7",
+      "port-version": 0
    },
    "p-ranav-csv": {
      "baseline": "2019-07-11",
@ -8141,8 +8141,8 @@
      "port-version": 0
    },
    "status-code": {
-      "baseline": "2023-01-27",
-      "port-version": 2
+      "baseline": "2023-11-06",
+      "port-version": 0
    },
    "status-value-lite": {
      "baseline": "1.1.0",
--- a/versions/l-/llfio.json
+++ b/versions/l-/llfio.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "dc1f2c9ef08627e6330c223e15dbe9f798545f0a",
+      "version-date": "2023-11-06",
+      "port-version": 0
+    },
    {
      "git-tree": "45b00c3d0af2dfae0043832ca9b6f86393a9b432",
      "version-date": "2023-03-13",
--- a/versions/n-/ned14-internal-quickcpplib.json
+++ b/versions/n-/ned14-internal-quickcpplib.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "7be7cf3170221b9393f84ec28a2b940956cabb9f",
+      "version-date": "2023-11-06",
+      "port-version": 0
+    },
    {
      "git-tree": "59fa084ab6de6874b5dc5e56665312104d0f454a",
      "version-date": "2023-03-13",
--- a/versions/o-/outcome.json
+++ b/versions/o-/outcome.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "47944a9cbc611b2c0b1d0a3acb1d0a38881dbc87",
+      "version": "2.2.7",
+      "port-version": 0
+    },
    {
      "git-tree": "504177d3c3f3d1a063db2ce6d12292141e874d37",
      "version": "2.2.4",
--- a/versions/s-/status-code.json
+++ b/versions/s-/status-code.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "dca3b484e4be516afae962ee6760d3eef5eb4779",
+      "version-date": "2023-11-06",
+      "port-version": 0
+    },
    {
      "git-tree": "40d6b3bdc23cdb7de14e9f07eb229d0124b9c550",
      "version-date": "2023-01-27",