diff options
| author | Carlos O'Ryan <coryan@users.noreply.github.com> | 2021-07-27 15:29:44 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-27 15:29:44 -0700 |
| commit | dc35791a568aacf855355bcfcdff978ec22e69d3 (patch) | |
| tree | 8c664e80a682d6429d0bce4887db6fd953726bd8 | |
| parent | 7dbc05515b44bf54d2a42b4da9d1e1f910868b86 (diff) | |
| download | vcpkg-dc35791a568aacf855355bcfcdff978ec22e69d3.tar.gz vcpkg-dc35791a568aacf855355bcfcdff978ec22e69d3.zip | |
[grpc] fix generated pkg-config file (#19174)
gRPC uses `upb`, but normally it vendors-in the dependency. The
vendored-in version uses a single library artifact, and the generated
pkg-config file simply adds `-lupb`. In `vcpkg` we use the `upb`
package. This has more libraries, and thus more `-lupb_*` options are
needed. Ideally we would use a `upb.pc` file, but that does not exist.
| -rw-r--r-- | ports/grpc/00014-pkgconfig-upbdefs.patch | 13 | ||||
| -rw-r--r-- | ports/grpc/portfile.cmake | 1 | ||||
| -rw-r--r-- | ports/grpc/vcpkg.json | 2 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/g-/grpc.json | 5 |
5 files changed, 21 insertions, 2 deletions
diff --git a/ports/grpc/00014-pkgconfig-upbdefs.patch b/ports/grpc/00014-pkgconfig-upbdefs.patch new file mode 100644 index 000000000..fd5a83563 --- /dev/null +++ b/ports/grpc/00014-pkgconfig-upbdefs.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3808016..059a16b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -15516,7 +15516,7 @@ generate_pkgconfig( + "high performance general RPC framework" + "${gRPC_CORE_VERSION}" + "gpr openssl" +- "-lgrpc -laddress_sorting -lre2 -lupb -lcares -lz -labsl_statusor -labsl_status -labsl_raw_hash_set -labsl_hashtablez_sampler -labsl_synchronization -labsl_time -labsl_time_zone -labsl_civil_time -labsl_graphcycles_internal -labsl_symbolize -labsl_demangle_internal -labsl_malloc_internal -labsl_stacktrace -labsl_debugging_internal -labsl_exponential_biased -labsl_cord -labsl_str_format_internal -labsl_hash -labsl_bad_variant_access -labsl_bad_optional_access -labsl_strings -labsl_strings_internal -labsl_base -labsl_spinlock_wait -labsl_int128 -labsl_city -labsl_throw_delegate -labsl_raw_logging_internal -labsl_log_severity" ++ "-lgrpc -laddress_sorting -lre2 -lupb_fastdecode -lupb_json -lupb_pb -lupb_handlers -lupb_textformat -lupb_reflection -lupb -lcares -lz -labsl_statusor -labsl_status -labsl_raw_hash_set -labsl_hashtablez_sampler -labsl_synchronization -labsl_time -labsl_time_zone -labsl_civil_time -labsl_graphcycles_internal -labsl_symbolize -labsl_demangle_internal -labsl_malloc_internal -labsl_stacktrace -labsl_debugging_internal -labsl_exponential_biased -labsl_cord -labsl_str_format_internal -labsl_hash -labsl_bad_variant_access -labsl_bad_optional_access -labsl_strings -labsl_strings_internal -labsl_base -labsl_spinlock_wait -labsl_int128 -labsl_city -labsl_throw_delegate -labsl_raw_logging_internal -labsl_log_severity" + "" + "grpc.pc") + diff --git a/ports/grpc/portfile.cmake b/ports/grpc/portfile.cmake index 3ec41fb2f..39aa2c5a9 100644 --- a/ports/grpc/portfile.cmake +++ b/ports/grpc/portfile.cmake @@ -20,6 +20,7 @@ vcpkg_from_github( snprintf.patch 00012-fix-use-cxx17.patch 00013-build-upbdefs.patch + 00014-pkgconfig-upbdefs.patch ) if(NOT TARGET_TRIPLET STREQUAL HOST_TRIPLET) diff --git a/ports/grpc/vcpkg.json b/ports/grpc/vcpkg.json index 118c58d18..1b7dfac45 100644 --- a/ports/grpc/vcpkg.json +++ b/ports/grpc/vcpkg.json @@ -1,7 +1,7 @@ { "name": "grpc", "version-semver": "1.37.0", - "port-version": 2, + "port-version": 3, "description": "An RPC library and framework", "homepage": "https://github.com/grpc/grpc", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 2b77f92ec..e9f6f6ec4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2418,7 +2418,7 @@ }, "grpc": { "baseline": "1.37.0", - "port-version": 2 + "port-version": 3 }, "grppi": { "baseline": "0.4.0", diff --git a/versions/g-/grpc.json b/versions/g-/grpc.json index 2b050b860..4d56acdef 100644 --- a/versions/g-/grpc.json +++ b/versions/g-/grpc.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "38a2b1bc9dd5fca170489b616d33efae6dd43158", + "version-semver": "1.37.0", + "port-version": 3 + }, + { "git-tree": "9bcee29de46cc5f1edbe016d192f243f65e64a5f", "version-semver": "1.37.0", "port-version": 2 |