mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-29 06:09:08 +08:00
16e95cee85
Update `folly` and its related ports to the latest version
`2024.05.20.00`.
The recent update to `folly` includes this commit:
99767aa88e,
which caused downstream `rsocket` to fail with the following error
during build.
```
vcpkg\rsocket\src\84ec7fc921-d730564084\rsocket\RSocketServer.cpp(32): error C2665: 'folly::ThreadLocal<rsocket::SetupResumeAcceptor,rsocket::RSocketServer::SetupResumeAcceptorTag,void>::ThreadLocal': no overloaded function could convert all the argument types
```
A patch has now been submitted to fix this issue.
- [x] Changes comply with the [maintainer
guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md).
- [x] SHA512s are updated for each updated download.
- [ ] ~The "supports" clause reflects platforms that may be fixed by
this new version.~
- [ ] ~Any fixed [CI
baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt)
entries are removed from that file.~
- [ ] ~Any patches that are no longer applied are deleted from the
port's directory.~
- [x] The version database is fixed by rerunning `./vcpkg x-add-version
--all` and committing the result.
- [x] Only one version is added to each modified port's versions file.
76 lines
4.1 KiB
CMake
76 lines
4.1 KiB
CMake
vcpkg_from_github(
|
|
OUT_SOURCE_PATH SOURCE_PATH
|
|
REPO facebook/fbthrift
|
|
REF "v${VERSION}"
|
|
SHA512 f4339d9986881cc883683e982e3266db17be0511f46f5baf80baf1c183996871a924b8ad7fc88f1c533d8ce5edcae5ae0aedc5c7fa4043a0e64f06845240319f
|
|
HEAD_REF main
|
|
PATCHES
|
|
fix-glog.patch
|
|
0002-fix-dependency.patch
|
|
)
|
|
|
|
file(REMOVE "${SOURCE_PATH}/thrift/cmake/FindGMock.cmake")
|
|
file(REMOVE "${SOURCE_PATH}/thrift/cmake/FindOpenSSL.cmake")
|
|
file(REMOVE "${SOURCE_PATH}/thrift/cmake/FindZstd.cmake")
|
|
file(REMOVE "${SOURCE_PATH}/build/fbcode_builder/CMake/FindGflags.cmake")
|
|
file(REMOVE "${SOURCE_PATH}/build/fbcode_builder/CMake/FindGlog.cmake")
|
|
file(REMOVE "${SOURCE_PATH}/build/fbcode_builder/CMake/FindGMock.cmake")
|
|
file(REMOVE "${SOURCE_PATH}/build/fbcode_builder/CMake/FindLibEvent.cmake")
|
|
file(REMOVE "${SOURCE_PATH}/build/fbcode_builder/CMake/FindSodium.cmake")
|
|
file(REMOVE "${SOURCE_PATH}/build/fbcode_builder/CMake/FindZstd.cmake")
|
|
|
|
vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}")
|
|
vcpkg_cmake_install()
|
|
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/fbthrift)
|
|
|
|
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/test"
|
|
"${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp/transport/test"
|
|
"${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp/util/test"
|
|
"${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/debug_thrift_data_difference/test"
|
|
"${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/detail/test"
|
|
"${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/folly_dynamic/test"
|
|
"${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/frozen/test"
|
|
"${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/protocol/test"
|
|
"${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/reflection/docs"
|
|
"${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/server/test"
|
|
"${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/test"
|
|
"${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/transport/core/test"
|
|
"${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/transport/http2/common/test"
|
|
"${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/transport/http2/server/test"
|
|
"${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/transport/http2/test"
|
|
"${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/transport/inmemory/test"
|
|
"${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/transport/rocket/client/test"
|
|
"${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/transport/rocket/framing/parser/test"
|
|
"${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/transport/rocket/server/test"
|
|
"${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/util/gtest/test"
|
|
"${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/benchmark"
|
|
"${CURRENT_PACKAGES_DIR}/include/thrift/lib/py3/test"
|
|
"${CURRENT_PACKAGES_DIR}/include/thrift/lib/thrift/annotation"
|
|
)
|
|
|
|
vcpkg_copy_tools(TOOL_NAMES thrift1 AUTO_CLEAN)
|
|
vcpkg_copy_pdbs()
|
|
|
|
if(EXISTS "${CURRENT_PACKAGES_DIR}/share/fbthrift/FBThriftConfig.cmake")
|
|
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/fbthrift/FBThriftConfig.cmake"
|
|
"${PACKAGE_PREFIX_DIR}/lib/cmake/fbthrift" "${PACKAGE_PREFIX_DIR}/share/fbthrift")
|
|
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/fbthrift/FBThriftConfig.cmake"
|
|
"${PACKAGE_PREFIX_DIR}/bin/thrift1.exe" "${PACKAGE_PREFIX_DIR}/tools/fbthrift/thrift1.exe")
|
|
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/fbthrift/FBThriftConfig.cmake"
|
|
"${PACKAGE_PREFIX_DIR}/bin/thrift1" "${PACKAGE_PREFIX_DIR}/tools/fbthrift/thrift1")
|
|
endif()
|
|
|
|
# Only used internally and removed in master
|
|
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/fbthrift/FBThriftTargets.cmake" "LOCATION_HH=\\\"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/thrift/compiler/location.hh\\\"" "")
|
|
|
|
# Handle copyright
|
|
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
|