Skip to content

Commit 1b0ae1d

Browse files
committed
Fix naming issue with grpc find_library call to protoc
1 parent 081b72a commit 1b0ae1d

File tree

3 files changed

+12
-5
lines changed

3 files changed

+12
-5
lines changed

releases.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1399,6 +1399,7 @@
13991399
"grpc_ruby_plugin"
14001400
],
14011401
"versions": [
1402+
"1.59.1-2",
14021403
"1.59.1-1"
14031404
]
14041405
},

subprojects/grpc.wrap

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,5 @@ source_hash = 916f88a34f06b56432611aaa8c55befee96d0a7b7d7457733b9deeacbc016f99
66
patch_directory = grpc
77

88
[provide]
9-
grpc = grpc_dep
10-
grpc_unsecure = grpc_unsecure_dep
11-
grpc++ = grpcpp_dep
12-
grpc++_unsecure = grpcpp_unsecure_dep
9+
dependency_names = grpc, grpc_unsecure, grpc++, grpc++_unsecure
1310
program_names = grpc_cpp_plugin, grpc_python_plugin, grpc_ruby_plugin, grpc_php_plugin, grpc_node_plugin

subprojects/packagefiles/grpc/meson.build

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,12 @@ protoc_dep = dependency(
7070
required: false,
7171
)
7272
if not protoc_dep.found()
73-
protoc_dep = cpp.find_library('protoc') # pkgconfig version does not provide protoc.pc
73+
# pkgconfig version does not provide protoc.pc
74+
if host_machine.system() == 'windows'
75+
protoc_dep = cpp.find_library('libprotoc')
76+
else
77+
protoc_dep = cpp.find_library('protoc')
78+
endif
7479
endif
7580
re2_dep = dependency('re2')
7681
winsock_dep = is_windows ? [
@@ -1013,6 +1018,7 @@ grpc_unsecure_dep = declare_dependency(
10131018
include_directories: common_include_dirs,
10141019
dependencies: [gpr_dep, libcares_dep],
10151020
)
1021+
meson.override_dependency('grpc_unsecure', grpc_unsecure_dep)
10161022

10171023
libupb_json_lib = library(
10181024
'upb_json_lib',
@@ -1913,6 +1919,7 @@ grpc_dep = declare_dependency(
19131919
include_directories: common_include_dirs,
19141920
dependencies: [gpr_dep, libcares_dep],
19151921
)
1922+
meson.override_dependency('grpc', grpc_dep)
19161923

19171924
libgrpcpp_unsecure = library(
19181925
'grpc++_unsecure',
@@ -1973,6 +1980,7 @@ grpcpp_unsecure_dep = declare_dependency(
19731980
include_directories: common_include_dirs,
19741981
dependencies: [grpc_unsecure_dep],
19751982
)
1983+
meson.override_dependency('grpc++_unsecure', grpcpp_unsecure_dep)
19761984

19771985
libgrpcpp = library(
19781986
'grpc++',
@@ -2067,6 +2075,7 @@ grpcpp_dep = declare_dependency(
20672075
include_directories: common_include_dirs,
20682076
dependencies: [grpc_dep],
20692077
)
2078+
meson.override_dependency('grpc++', grpcpp_dep)
20702079

20712080
libgrpcpp_alts = library(
20722081
'grpc++_alts',

0 commit comments

Comments
 (0)