early-access version 2853
This commit is contained in:
35
externals/vcpkg/ports/fizz/0001-fix-libsodium.patch
vendored
Executable file
35
externals/vcpkg/ports/fizz/0001-fix-libsodium.patch
vendored
Executable file
@@ -0,0 +1,35 @@
|
||||
diff --git a/fizz/CMakeLists.txt b/fizz/CMakeLists.txt
|
||||
index bb3e15e5..80c5051e 100644
|
||||
--- a/fizz/CMakeLists.txt
|
||||
+++ b/fizz/CMakeLists.txt
|
||||
@@ -64,7 +64,7 @@ endif()
|
||||
|
||||
include(CheckAtomic)
|
||||
|
||||
-find_package(Sodium REQUIRED)
|
||||
+find_package(unofficial-sodium CONFIG REQUIRED)
|
||||
|
||||
SET(FIZZ_SHINY_DEPENDENCIES "")
|
||||
SET(FIZZ_LINK_LIBRARIES "")
|
||||
@@ -255,7 +255,7 @@ target_link_libraries(fizz
|
||||
PUBLIC
|
||||
${FOLLY_LIBRARIES}
|
||||
${OPENSSL_LIBRARIES}
|
||||
- sodium
|
||||
+ unofficial-sodium::sodium
|
||||
Threads::Threads
|
||||
ZLIB::ZLIB
|
||||
${ZSTD_LIBRARY}
|
||||
diff --git a/fizz/cmake/fizz-config.cmake.in b/fizz/cmake/fizz-config.cmake.in
|
||||
index 679b0e61..b28750fa 100644
|
||||
--- a/fizz/cmake/fizz-config.cmake.in
|
||||
+++ b/fizz/cmake/fizz-config.cmake.in
|
||||
@@ -26,7 +26,7 @@ endif()
|
||||
set(FIZZ_LIBRARIES fizz::fizz)
|
||||
|
||||
include(CMakeFindDependencyMacro)
|
||||
-find_dependency(Sodium)
|
||||
+find_dependency(unofficial-sodium CONFIG REQUIRED)
|
||||
find_dependency(folly CONFIG)
|
||||
find_dependency(ZLIB)
|
||||
|
||||
30
externals/vcpkg/ports/fizz/0002-fix-libevent.patch
vendored
Executable file
30
externals/vcpkg/ports/fizz/0002-fix-libevent.patch
vendored
Executable file
@@ -0,0 +1,30 @@
|
||||
diff --git a/fizz/CMakeLists.txt b/fizz/CMakeLists.txt
|
||||
index 80c5051..9f2e3e6 100644
|
||||
--- a/fizz/CMakeLists.txt
|
||||
+++ b/fizz/CMakeLists.txt
|
||||
@@ -92,10 +92,10 @@ endif()
|
||||
|
||||
find_package(ZLIB REQUIRED)
|
||||
|
||||
-find_package(Libevent CONFIG QUIET)
|
||||
-if(TARGET event)
|
||||
+find_package(Libevent CONFIG REQUIRED)
|
||||
+if(TARGET libevent::core)
|
||||
message(STATUS "Found libevent from package config")
|
||||
- list(APPEND FIZZ_SHINY_DEPENDENCIES event)
|
||||
+ list(APPEND FIZZ_SHINY_DEPENDENCIES libevent::core)
|
||||
else()
|
||||
find_package(Libevent MODULE REQUIRED)
|
||||
list(APPEND FIZZ_LINK_LIBRARIES ${LIBEVENT_LIB})
|
||||
diff --git a/fizz/cmake/fizz-config.cmake.in b/fizz/cmake/fizz-config.cmake.in
|
||||
index b28750f..282c42d 100644
|
||||
--- a/fizz/cmake/fizz-config.cmake.in
|
||||
+++ b/fizz/cmake/fizz-config.cmake.in
|
||||
@@ -29,6 +29,7 @@ include(CMakeFindDependencyMacro)
|
||||
find_dependency(unofficial-sodium CONFIG REQUIRED)
|
||||
find_dependency(folly CONFIG)
|
||||
find_dependency(ZLIB)
|
||||
+find_dependency(Libevent CONFIG)
|
||||
|
||||
if (NOT fizz_FIND_QUIETLY)
|
||||
message(STATUS "Found fizz: ${PACKAGE_PREFIX_DIR}")
|
||||
40
externals/vcpkg/ports/fizz/portfile.cmake
vendored
Executable file
40
externals/vcpkg/ports/fizz/portfile.cmake
vendored
Executable file
@@ -0,0 +1,40 @@
|
||||
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
|
||||
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO facebookincubator/fizz
|
||||
REF v2022.03.21.00
|
||||
SHA512 81a7b764c2c2e17fd5df32a69ecb368eb01df04df6dbd1155a40b68fc39cda4f86ce81afc5c89425a5751ef7f4dbb8a40df8b5095685e72ce5e9043c0a74682e
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
0001-fix-libsodium.patch
|
||||
0002-fix-libevent.patch
|
||||
)
|
||||
|
||||
# Prefer installed config files
|
||||
file(REMOVE
|
||||
${SOURCE_PATH}/fizz/cmake/FindGMock.cmake
|
||||
${SOURCE_PATH}/fizz/cmake/FindGflags.cmake
|
||||
${SOURCE_PATH}/fizz/cmake/FindGlog.cmake
|
||||
${SOURCE_PATH}/fizz/cmake/FindLibevent.cmake
|
||||
)
|
||||
|
||||
vcpkg_cmake_configure(
|
||||
SOURCE_PATH "${SOURCE_PATH}/fizz"
|
||||
OPTIONS
|
||||
-DBUILD_TESTS=OFF
|
||||
-DBUILD_EXAMPLES=OFF
|
||||
-DINCLUDE_INSTALL_DIR:STRING=include
|
||||
)
|
||||
|
||||
vcpkg_cmake_install()
|
||||
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/fizz)
|
||||
vcpkg_copy_pdbs()
|
||||
|
||||
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/fizz/fizz-config.cmake" "lib/cmake/fizz" "share/fizz")
|
||||
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
||||
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/fizz/tool/test" "${CURRENT_PACKAGES_DIR}/include/fizz/util/test")
|
||||
|
||||
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
||||
24
externals/vcpkg/ports/fizz/vcpkg.json
vendored
Executable file
24
externals/vcpkg/ports/fizz/vcpkg.json
vendored
Executable file
@@ -0,0 +1,24 @@
|
||||
{
|
||||
"name": "fizz",
|
||||
"version-string": "2022.03.21.00",
|
||||
"port-version": 1,
|
||||
"description": "a TLS 1.3 implementation by Facebook",
|
||||
"homepage": "https://github.com/facebookincubator/fizz",
|
||||
"dependencies": [
|
||||
"double-conversion",
|
||||
"fmt",
|
||||
"folly",
|
||||
"libevent",
|
||||
"libsodium",
|
||||
"openssl",
|
||||
{
|
||||
"name": "vcpkg-cmake",
|
||||
"host": true
|
||||
},
|
||||
{
|
||||
"name": "vcpkg-cmake-config",
|
||||
"host": true
|
||||
},
|
||||
"zstd"
|
||||
]
|
||||
}
|
||||
Reference in New Issue
Block a user