-
Notifications
You must be signed in to change notification settings - Fork 6.6k
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.
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
[grpc/protobuf] Update grpc to 1.60.0 and update protobuf to 3.25.1 #35781
Merged
Merged
Changes from all commits
Commits
Show all changes
46 commits
Select commit
Hold shift + click to select a range
059b2a0
grpc: Update to 1.60.0. Update protobuf, upb and utf8-range to 3.25.1
Tradias 05a0c37
protobuf: Fix dll macro and add patches for libprotobuf-mutator. Also…
Tradias 48e51a2
protobuf: Fix tool installation for non-windows
Tradias 1daa78e
grpc: Fix pluginTargets.cmake. Also update gz-transport12 and patch o…
Tradias 0b60e1b
protobuf: Fix several dependent packages after major version update a…
Tradias f848e98
protobuf: Fix dependent ignition-transport, gamenetworkingsockets and…
Tradias cf2801b
protobuf: Update and patch brpc and shogun. Simplify paraview protobu…
Tradias c9cdfae
protobuf: Update arcus. Fix libprotobuf-mutator protobuf patch
Tradias 3bed1e5
protobuf: Adjust braft, libtorch, osgearth and pulsar-client-cpp to p…
Tradias 50ea872
srpc: Adjust baseline version
Tradias eb32f57
libprotobuf-mutator: Fix msvc static runtime
Tradias 2a7e2dd
protobuf: Adjust osgearth and paraview patches
Tradias e727f63
srpc: Update to 0.10.1 and fix protobuf linkage
Tradias 2f90739
protobuf: Adjust removal of unused language backends and fix srpc get…
Tradias 544f34d
protobuf: Fix depend cld3 library. Adjust srpc crt linkage. Remove du…
Tradias 024220f
protobuf: Fix dependency propagation through cmake config file in bra…
Tradias 3e23c1c
protobuf: Fix cld3, brpc, ecal and srpc osx builds
Tradias 9aaf9ee
protobuf: Fix ecal and srpc patches
Tradias 62fe5bc
mysql-connector-cpp: Add protobuf patch
Tradias a8c6358
marble: Patch accidental dependency on protobuf
Tradias a78b65b
protobuf: Change patches of several ports from find_package(protobuf …
Tradias ee9b972
protobuf: Patch mysql-connector-cpp and clean up openvino patch
Tradias 7bbb939
glog: FIx braft and brpc after update
Tradias ecbdcad
protobuf: Attempt to fix mysql-connector-cpp protobuf executable not …
Tradias 84c5053
protobuf: Fix mysql-connector-cpp when using protobuf with zlib feature
Tradias a27f01f
protobuf: Fix braft patch. Re-add port-version to marble. Fix ZLIB in…
Tradias 70f976d
protobuf: Adjust mysql-connector-cpp patch to properly work with zlib…
Tradias fcba37d
brpc: Patch out #warning because OSX compiles with -Werror
Tradias 506ca8b
cld3: Bump port version
Tradias 0065778
grpc: Add patch for abseil 20240116.1
Tradias d8a32ca
abseil: Fix version in abseil_dll.pc
Tradias f3b1661
shogun: Remove unneeded patches
Tradias cdddfd2
abseil: Revert abseil back to 20240116.1 and add patch to fix openvin…
Tradias cabd5da
libprotobuf-mutator: Update to 1.3
Tradias dba071c
protobuf: Adjust version to 4.25.1 and reduce upb patch
Tradias 94bd825
paraview: Bump port-version
Tradias e56d40d
shogun: Remove bitsery and restore its ci.baseline
Tradias 8cd9334
protobuf: Update versions file
Tradias 89660d4
protobuf: Include CONFIG in vcpkg-cmake-wrapper
Tradias 445e091
protobuf: Fix find version in arcus and cartographer
Tradias 832b11a
cartographer: Fix absolute path issue and disable compilation of test…
Tradias 043f156
brpc/pulsar-cpp-client: Patch warnings caused by abseil dynamic_annot…
Tradias 286f6fd
Merge remote-tracking branch 'origin/master' into HEAD
BillyONeal 73dd53a
Merge branch 'master' into grpc-1-60-0
Tradias 69da939
Merge remote-tracking branch 'origin/master' into HEAD
BillyONeal d2604eb
[protobuf] Skip unchanged vcpkg_replace_string.
BillyONeal File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
1,313 changes: 1,313 additions & 0 deletions
1,313
ports/abseil/0001-revert-integer-to-string-conversion-optimizations.patch
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| diff --git a/ArcusConfig.cmake.in b/ArcusConfig.cmake.in | ||
| index 3208a69..fb4a968 100644 | ||
| --- a/ArcusConfig.cmake.in | ||
| +++ b/ArcusConfig.cmake.in | ||
| @@ -4,7 +4,7 @@ | ||
| # However, if ProtobufConfig is used instead, there is a CMake option that controls | ||
| # this, which defaults to OFF. We need to force this option to ON instead. | ||
| set(protobuf_MODULE_COMPATIBLE ON CACHE "" INTERNAL FORCE) | ||
| -find_package(Protobuf 3.0.0 REQUIRED) | ||
| +find_package(Protobuf REQUIRED) | ||
|
|
||
| get_filename_component(SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) | ||
| include(${SELF_DIR}/Arcus-targets.cmake) | ||
| diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| index 1d736ba..66d6c13 100644 | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -17,7 +17,7 @@ endif() | ||
| # However, if ProtobufConfig is used instead, there is a CMake option that controls | ||
| # this, which defaults to OFF. We need to force this option to ON instead. | ||
| set(protobuf_MODULE_COMPATIBLE ON CACHE INTERNAL "" FORCE) | ||
| -find_package(Protobuf 3.0.0 REQUIRED) | ||
| +find_package(Protobuf REQUIRED) | ||
|
|
||
| set(CMAKE_POSITION_INDEPENDENT_CODE ON) #Required if a patch to libArcus needs to be made via templates. | ||
|
|
||
| @@ -103,9 +103,8 @@ endif() | ||
| target_include_directories(Arcus PUBLIC | ||
| $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src> | ||
| $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}> | ||
| - ${PROTOBUF_INCLUDE_DIR} | ||
| ) | ||
| -target_link_libraries(Arcus PUBLIC ${PROTOBUF_LIBRARIES}) | ||
| +target_link_libraries(Arcus PUBLIC protobuf::libprotobuf) | ||
|
|
||
| if(WIN32) | ||
| add_definitions(-D_WIN32_WINNT=0x0600) # Declare we require Vista or higher, this allows us to use IPv6 functions. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| index 28c1026..65af3ae 100644 | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -22,7 +22,7 @@ endif() | ||
| set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake) | ||
|
|
||
| include(FindThreads) | ||
| -include(FindProtobuf) | ||
| +find_package(Protobuf CONFIG REQUIRED) | ||
|
|
||
| if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") | ||
| # require at least gcc 4.8 | ||
| @@ -69,7 +69,8 @@ if ((NOT BRPC_INCLUDE_PATH) OR (NOT BRPC_LIB)) | ||
| message(FATAL_ERROR "Fail to find brpc") | ||
| endif() | ||
|
|
||
| -if (NOT PROTOBUF_PROTOC_EXECUTABLE) | ||
| +set(PROTOBUF_LIBRARY protobuf::libprotobuf) | ||
| +if (0) | ||
Tradias marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| get_filename_component(PROTO_LIB_DIR ${PROTOBUF_LIBRARY} DIRECTORY) | ||
| set (PROTOBUF_PROTOC_EXECUTABLE "${PROTO_LIB_DIR}/../bin/protoc") | ||
| endif() | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't see why you are using CONFIG here.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
CMake has a build-in https://cmake.org/cmake/help/latest/module/FindProtobuf.html which does not setup abseil linkage properly.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If that is the case you install a
vcpkg-cmake-wrapper.cmakeand fix that. You do not patch every downstream consumer.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
On March 5, I proposed #35781 (comment)...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I didn't exactly know what the wrapper does, sorry for not asking. I added
CONFIGto the protobuf wrapper now, it reduces some of the patching (cld3, gamenetworkingsockets, libosmscout, libprotobuf-mutator, osgearth, pulsar-client, ecal) but also adds some (arcus, cartographer).There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No problem.
There is one problem which the wrapper can't solve: When you switch a port from LIBRARIES variable to the imported target, you must add
find_dependencyto exported config.This could be avoided by keeping variables free of targets, but often this is (too) hard.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't understand why this is a
must, it is merely an inconvenience. Users can still consume these ports by adding the missingfind_packagecalls for the dependencies themselves.The way I changed protobuf's cmake-wrapper I no longer set these variables at all, not sure how it would help when most libs do
target_link_libraries(target ${PROTOBUF_LIBRARIES})anyways.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It is not a
mustto have cmake packages at all... User can just usefind_librarydirectly.Seriously, it is a
mustat least in vcpkg thatfind_packagecares for transitive dependencies.