early-access version 2853
This commit is contained in:
30
externals/vcpkg/ports/proxygen/fix-zstd-zlib-dependency.patch
vendored
Executable file
30
externals/vcpkg/ports/proxygen/fix-zstd-zlib-dependency.patch
vendored
Executable file
@@ -0,0 +1,30 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index ea22eab..6bf0f17 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -74,7 +74,7 @@ if (BUILD_QUIC)
|
||||
else()
|
||||
find_package(Fizz REQUIRED)
|
||||
endif()
|
||||
-find_package(Zstd REQUIRED)
|
||||
+find_package(zstd CONFIG REQUIRED)
|
||||
find_package(ZLIB REQUIRED)
|
||||
find_package(OpenSSL REQUIRED)
|
||||
find_package(Threads)
|
||||
diff --git a/proxygen/lib/CMakeLists.txt b/proxygen/lib/CMakeLists.txt
|
||||
index b3fa2d1..5c50ee1 100644
|
||||
--- a/proxygen/lib/CMakeLists.txt
|
||||
+++ b/proxygen/lib/CMakeLists.txt
|
||||
@@ -235,10 +235,10 @@ target_link_libraries(
|
||||
Folly::folly
|
||||
fizz::fizz
|
||||
wangle::wangle
|
||||
- zstd
|
||||
+ $<IF:$<TARGET_EXISTS:zstd::libzstd_shared>,zstd::libzstd_shared,zstd::libzstd_static>
|
||||
Boost::boost
|
||||
Boost::iostreams
|
||||
- -lz
|
||||
+ ZLIB::ZLIB
|
||||
${HTTP3_DEPEND_LIBS}
|
||||
)
|
||||
|
||||
31
externals/vcpkg/ports/proxygen/portfile.cmake
vendored
Executable file
31
externals/vcpkg/ports/proxygen/portfile.cmake
vendored
Executable file
@@ -0,0 +1,31 @@
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO facebook/proxygen
|
||||
REF v2022.03.21.00
|
||||
SHA512 66dfd40e45b884d64be9c06b110caaa9333116c402312ee8eb0c21f0ab569ea31b9e4fb676c68b96730abbff0b74d139f5e39e702cd958c24ce0fe76f353fbe9
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
remove-register.patch
|
||||
fix-zstd-zlib-dependency.patch
|
||||
)
|
||||
|
||||
vcpkg_find_acquire_program(PYTHON3)
|
||||
get_filename_component(PYTHON3_PATH "${PYTHON3}" DIRECTORY)
|
||||
vcpkg_add_to_path(${PYTHON3_PATH})
|
||||
|
||||
vcpkg_add_to_path(PREPEND "${CURRENT_HOST_INSTALLED_DIR}/tools/gperf")
|
||||
|
||||
vcpkg_cmake_configure(
|
||||
SOURCE_PATH ${SOURCE_PATH}
|
||||
)
|
||||
|
||||
vcpkg_cmake_install()
|
||||
|
||||
vcpkg_copy_tools(TOOL_NAMES proxygen_curl proxygen_echo proxygen_proxy proxygen_push proxygen_static AUTO_CLEAN)
|
||||
|
||||
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/proxygen)
|
||||
vcpkg_copy_pdbs()
|
||||
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
||||
|
||||
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
||||
12
externals/vcpkg/ports/proxygen/remove-register.patch
vendored
Executable file
12
externals/vcpkg/ports/proxygen/remove-register.patch
vendored
Executable file
@@ -0,0 +1,12 @@
|
||||
diff --git a/proxygen/lib/utils/gen_perfect_hash_table.sh b/proxygen/lib/utils/gen_perfect_hash_table.sh
|
||||
index a870b2d67..2dec9c5a1 100755
|
||||
--- a/proxygen/lib/utils/gen_perfect_hash_table.sh
|
||||
+++ b/proxygen/lib/utils/gen_perfect_hash_table.sh
|
||||
@@ -35,6 +35,7 @@ function generate_perfect_hash_table {
|
||||
LC_ALL=C sort -u ${1?} | awk "${6?}" - "${5?}" | \
|
||||
${8:-gperf} -m5 -D --output-file="${7?}"
|
||||
perl -p -i -e "s/\/\*FALLTHROUGH\*\//FOLLY_FALLTHROUGH;/g" "${7?}"
|
||||
+ perl -p -i -e "s/register//g" "${7?}"
|
||||
|
||||
# Here we delete one of the comment lines gperf adds to the top of the file.
|
||||
# i.e. /* Command-line: .../gperf -m5 --output-file=... */
|
||||
36
externals/vcpkg/ports/proxygen/vcpkg.json
vendored
Executable file
36
externals/vcpkg/ports/proxygen/vcpkg.json
vendored
Executable file
@@ -0,0 +1,36 @@
|
||||
{
|
||||
"name": "proxygen",
|
||||
"version-string": "2022.03.21.00",
|
||||
"port-version": 2,
|
||||
"description": "It comprises the core C++ HTTP abstractions used at Facebook.",
|
||||
"homepage": "https://github.com/facebook/proxygen",
|
||||
"supports": "!windows",
|
||||
"dependencies": [
|
||||
"boost-context",
|
||||
"boost-date-time",
|
||||
"boost-filesystem",
|
||||
"boost-iostreams",
|
||||
"boost-program-options",
|
||||
"boost-regex",
|
||||
"boost-system",
|
||||
"boost-thread",
|
||||
"fizz",
|
||||
"folly",
|
||||
{
|
||||
"name": "gperf",
|
||||
"host": true
|
||||
},
|
||||
"openssl",
|
||||
{
|
||||
"name": "vcpkg-cmake",
|
||||
"host": true
|
||||
},
|
||||
{
|
||||
"name": "vcpkg-cmake-config",
|
||||
"host": true
|
||||
},
|
||||
"wangle",
|
||||
"zlib",
|
||||
"zstd"
|
||||
]
|
||||
}
|
||||
Reference in New Issue
Block a user