Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Folly, fizz, wangle, proxygen, fbthrift, mvfst] Update to latest version #22967

Merged
merged 40 commits into from
Feb 9, 2022
Merged

[Folly, fizz, wangle, proxygen, fbthrift, mvfst] Update to latest version #22967

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
13d5464
Update folly
Thomas1664 Feb 6, 2022
9052910
Update wangle
Thomas1664 Feb 6, 2022
e68bbf6
Update fizz
Thomas1664 Feb 6, 2022
6260cd9
Merge branch 'folly-fizz-wangle' of https://github.com/Thomas1664/vcp…
Thomas1664 Feb 6, 2022
77f3002
Version
Thomas1664 Feb 6, 2022
9b1495c
Fix patch
Thomas1664 Feb 6, 2022
5a742dc
Fix patch
Thomas1664 Feb 6, 2022
4030f6d
version
Thomas1664 Feb 6, 2022
da8d838
Fix error in rsocket
Thomas1664 Feb 6, 2022
07ee6ba
Fix patch
Thomas1664 Feb 6, 2022
f4d977b
Fix patch
Thomas1664 Feb 6, 2022
6e2e565
version vor rsocket
Thomas1664 Feb 6, 2022
b99193a
Update fbthrift
Thomas1664 Feb 6, 2022
126072d
fbthrift version
Thomas1664 Feb 6, 2022
2e83103
Fix fbthrift
Thomas1664 Feb 6, 2022
79c1d48
Fix fbthreft version
Thomas1664 Feb 6, 2022
75fa1b9
fbthrift: fix empty dir
Thomas1664 Feb 6, 2022
f690784
fbthrift: update version
Thomas1664 Feb 6, 2022
cac2cd0
Update mvfst
Thomas1664 Feb 6, 2022
972dd98
Update proxygen
Thomas1664 Feb 6, 2022
2e07e35
Update hashes
Thomas1664 Feb 6, 2022
7e72c02
update version
Thomas1664 Feb 6, 2022
8592147
remove unused patchfiles
Thomas1664 Feb 6, 2022
bef479e
Fix deprecated cmake functions
Thomas1664 Feb 6, 2022
15ee919
format and version
Thomas1664 Feb 6, 2022
17d7cee
version
Thomas1664 Feb 6, 2022
a15dd9e
rsocket: fix version
Thomas1664 Feb 7, 2022
fa3554e
rsocket: update port version
Thomas1664 Feb 7, 2022
bfe663d
fix version
Thomas1664 Feb 7, 2022
6cfe5b4
fix version
Thomas1664 Feb 7, 2022
7c13d99
update version
Thomas1664 Feb 7, 2022
92ef712
restore version
Thomas1664 Feb 7, 2022
7a63b73
update port version
Thomas1664 Feb 7, 2022
1c528b3
update version
Thomas1664 Feb 7, 2022
1f5d021
fix port version
Thomas1664 Feb 8, 2022
248a4ea
version
Thomas1664 Feb 8, 2022
578c8ca
remove v from version string
Thomas1664 Feb 8, 2022
fa48e9e
version
Thomas1664 Feb 8, 2022
132298c
Add quotes
Thomas1664 Feb 8, 2022
1a6a88e
version
Thomas1664 Feb 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 0 additions & 16 deletions ports/fbthrift/fix-sodium-target.patch
View file
Open in desktop

This file was deleted.

100 changes: 0 additions & 100 deletions ports/fbthrift/fix-zlib.patch
View file
Open in desktop

This file was deleted.

55 changes: 26 additions & 29 deletions ports/fbthrift/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,51 +4,48 @@ vcpkg_find_acquire_program(BISON)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO facebook/fbthrift
REF v2021.06.14.00
SHA512 e59465adcd57722626e5a4407529b164472cde3942bd100b3d6e92c5057f88f1a8544b7181a01e05ed3077ffd2b3811b687aa6741d08aedef6b79aea02305798
REF v2022.01.31.00
SHA512 159457398fdc0c89c34364b8a89068127c3519ce35af349776016e0ae37ae9508689853e0e371c2065fd715451f466e37c7e3799e054eca02cbc4717809150ab
HEAD_REF master
PATCHES
fix-sodium-target.patch # fixed in master
fix-zlib.patch # fixed in master
)

vcpkg_configure_cmake(
vcpkg_cmake_configure(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS
-DBISON_EXECUTABLE=${BISON}
-DFLEX_EXECUTABLE=${FLEX}
)

vcpkg_install_cmake()
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/fbthrift)
vcpkg_cmake_install()
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/fbthrift)

file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")

# There should be no empty directories in vcpkg/packages/fbthrift_x64-linux
file(REMOVE_RECURSE
${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp/transport/test
${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp/test
${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp/util/test
${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/transport/http2/server/test
${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/transport/http2/common/test
${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/transport/http2/test
${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/transport/core/test
${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/transport/inmemory/test
${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/protocol/test
${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/security/extensions/test
${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/security/test
${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/test
${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/frozen/test
${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/reflection/docs
${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/util/test
${CURRENT_PACKAGES_DIR}/include/thrift/lib/py3/test
${CURRENT_PACKAGES_DIR}/include/thrift/lib/py3/benchmark
${CURRENT_PACKAGES_DIR}/include/thrift/lib/thrift/annotation
"${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp/transport/test"
"${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp/test"
"${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp/util/test"
"${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/transport/http2/server/test"
"${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/transport/http2/common/test"
"${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/transport/http2/test"
"${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/transport/core/test"
"${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/transport/inmemory/test"
"${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/protocol/test"
"${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/security/extensions/test"
"${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/security/test"
"${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/test"
"${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/frozen/test"
"${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/reflection/docs"
"${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/util/test"
"${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/visitation/test"
"${CURRENT_PACKAGES_DIR}/include/thrift/lib/py3/test"
"${CURRENT_PACKAGES_DIR}/include/thrift/lib/py3/benchmark"
"${CURRENT_PACKAGES_DIR}/include/thrift/lib/thrift/annotation"
)

vcpkg_copy_tools(TOOL_NAMES thrift1 AUTO_CLEAN)
vcpkg_copy_pdbs()

# Handle copyright
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
11 changes: 9 additions & 2 deletions ports/fbthrift/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"name": "fbthrift",
"version-string": "2021.06.14.00",
"port-version": 1,
"version-string": "2022.01.31.00",
"description": "Facebook's branch of Apache Thrift, including a new C++ server.",
"homepage": "https://github.com/facebook/fbthrift",
"supports": "x64",
Expand All @@ -18,6 +17,14 @@
"gflags",
"glog",
"openssl",
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
},
"wangle",
"zlib",
"zstd"
Expand Down
20 changes: 10 additions & 10 deletions ports/fizz/0001-fix-libsodium.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
diff --git a/fizz/CMakeLists.txt b/fizz/CMakeLists.txt
index 471d61a..b3cfed2 100644
index bb3e15e5..80c5051e 100644
--- a/fizz/CMakeLists.txt
+++ b/fizz/CMakeLists.txt
@@ -61,7 +61,7 @@ endif()
@@ -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 "")
@@ -246,7 +246,7 @@ target_link_libraries(fizz
@@ -255,7 +255,7 @@ target_link_libraries(fizz
PUBLIC
${FOLLY_LIBRARIES}
${OPENSSL_LIBRARIES}
- sodium
+ unofficial-sodium::sodium
Threads::Threads
ZLIB::ZLIB
PRIVATE
${ZSTD_LIBRARY}
diff --git a/fizz/cmake/fizz-config.cmake.in b/fizz/cmake/fizz-config.cmake.in
index 679b0e6..b28750f 100644
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)

36 changes: 0 additions & 36 deletions ports/fizz/fix-zlib.patch
View file
Open in desktop

This file was deleted.

18 changes: 7 additions & 11 deletions ports/fizz/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,10 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO facebookincubator/fizz
REF v2021.06.14.00
SHA512 ff55f933d55031128b5355707fd025649ad90d261d91ec5f9d793433a77e63d3c2527a7f0111d6a3151667ab29f4117f96a505bcb80c1a4a99bd60346f05f4de
REF v2022.01.31.00
SHA512 544f843f47cb6113d0ad804079e6d767f33723d9d529c2751c5c6317d65c35bd327b43852904b2a37c2af615276176fe2de667907a9a460c0dfc7593eca46459
HEAD_REF master
PATCHES
fix-zlib.patch
0001-fix-libsodium.patch
)

Expand All @@ -17,25 +16,22 @@ file(REMOVE
${SOURCE_PATH}/fizz/cmake/FindGlog.cmake
)

vcpkg_configure_cmake(
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}/fizz"
PREFER_NINJA
OPTIONS
-DBUILD_TESTS=OFF
-DBUILD_EXAMPLES=OFF
-DINCLUDE_INSTALL_DIR:STRING=include
)

vcpkg_install_cmake()
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/fizz)
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}/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)
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
11 changes: 9 additions & 2 deletions ports/fizz/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,21 @@
{
"name": "fizz",
"version-string": "2021.06.14.00",
"port-version": 1,
"version-string": "2022.01.31.00",
"description": "a TLS 1.3 implementation by Facebook",
"homepage": "https://github.com/facebookincubator/fizz",
"dependencies": [
"fmt",
"folly",
"libsodium",
"openssl",
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
},
"zstd"
]
}
Loading