From a0ff978c5cdc06cf6006dd0a67c2ec478849dcd7 Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Tue, 7 Mar 2023 04:09:55 +0800 Subject: [PATCH] [baseline][ngtcp2] Disable all find_package to fix configure error (#30040) --- ports/ngtcp2/portfile.cmake | 15 +++++++++++++-- ports/ngtcp2/vcpkg.json | 1 + versions/baseline.json | 5 +++-- versions/n-/ngtcp2.json | 5 +++++ 4 files changed, 22 insertions(+), 4 deletions(-) diff --git a/ports/ngtcp2/portfile.cmake b/ports/ngtcp2/portfile.cmake index 0b3e1c5add..f21fc0a285 100644 --- a/ports/ngtcp2/portfile.cmake +++ b/ports/ngtcp2/portfile.cmake @@ -1,7 +1,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ngtcp2/ngtcp2 - REF v${VERSION} + REF "v${VERSION}" SHA512 8456ca20c54da8627cd37c313605563bc7bc2f80409aae0049354877e4ccc351f8dd1129ae67bb9fd3b148a2ef69db3670d6c1d2b8df40da26fa8c1b56993e03 HEAD_REF master PATCHES @@ -16,6 +16,17 @@ vcpkg_cmake_configure( OPTIONS "-DENABLE_STATIC_LIB=${ENABLE_STATIC_LIB}" "-DENABLE_SHARED_LIB=${ENABLE_SHARED_LIB}" + -DCMAKE_DISABLE_FIND_PACKAGE_GnuTLS=ON + -DCMAKE_DISABLE_FIND_PACKAGE_OpenSSL=ON + -DCMAKE_DISABLE_FIND_PACKAGE_wolfssl=ON + -DCMAKE_DISABLE_FIND_PACKAGE_Jemalloc=ON + -DCMAKE_DISABLE_FIND_PACKAGE_Libev=ON + -DCMAKE_DISABLE_FIND_PACKAGE_Libnghttp3=ON + -DCMAKE_DISABLE_FIND_PACKAGE_CUnit=ON + MAYBE_UNUSED_VARIABLES + CMAKE_DISABLE_FIND_PACKAGE_GnuTLS + CMAKE_DISABLE_FIND_PACKAGE_Jemalloc + CMAKE_DISABLE_FIND_PACKAGE_wolfssl ) vcpkg_cmake_install() vcpkg_copy_pdbs() @@ -33,4 +44,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") #License -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") diff --git a/ports/ngtcp2/vcpkg.json b/ports/ngtcp2/vcpkg.json index 43f04edf7e..aee9221916 100644 --- a/ports/ngtcp2/vcpkg.json +++ b/ports/ngtcp2/vcpkg.json @@ -1,6 +1,7 @@ { "name": "ngtcp2", "version": "0.13.1", + "port-version": 1, "description": "ngtcp2 project is an effort to implement RFC9000 QUIC protocol.", "homepage": "https://github.com/ngtcp2/ngtcp2", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 35df197ff0..525f417829 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3841,7 +3841,8 @@ "port-version": 6 }, "libdeflate": { - "baseline": "1.17" + "baseline": "1.17", + "port-version": 0 }, "libdisasm": { "baseline": "0.23", @@ -5421,7 +5422,7 @@ }, "ngtcp2": { "baseline": "0.13.1", - "port-version": 0 + "port-version": 1 }, "nifly": { "baseline": "1.0.0", diff --git a/versions/n-/ngtcp2.json b/versions/n-/ngtcp2.json index 478ced02d6..3598302248 100644 --- a/versions/n-/ngtcp2.json +++ b/versions/n-/ngtcp2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "650ddd9f22d59c17ff9adbb88b23c99c4cd2a742", + "version": "0.13.1", + "port-version": 1 + }, { "git-tree": "1387b33cfba7ba284c8862a97cf5d6fa9dfc8a9a", "version": "0.13.1",