proxmox-mirrors/llvm-toolchain
1
0
Fork 0
mirror of https://git.proxmox.com/git/llvm-toolchain synced 2025-06-15 16:07:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

link-grpc.diff: add the detection of other libs necessary for grpc (Closes: #1025529)

Browse Source
This commit is contained in:
Sylvestre Ledru 2022-12-26 17:56:24 +01:00
parent d98af97b4b
commit dcf126ba32
3 changed files with 45 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
debian/changelog vendored
View File

@ -1,10 +1,12 @@
llvm-toolchain-14 (1:14.0.6-10~exp4) UNRELEASED; urgency=medium llvm-toolchain-14 (1:14.0.6-10~exp4) experimental; urgency=medium
* Move the compiler-rt content into a new package called * Move the compiler-rt content into a new package called
libclang-rt-X.Y-dev (including polly) libclang-rt-X.Y-dev (including polly)
* the wasm targets are shipped into libclang-rt-14-dev-wasm32 * the wasm targets are shipped into libclang-rt-14-dev-wasm32
and libclang-rt-14-dev-wasm64 and libclang-rt-14-dev-wasm64
* libclang-common-X.Y-dev arch moved to all * libclang-common-X.Y-dev arch moved to all
* link-grpc.diff: add the detection of other libs necessary for
grpc (Closes: #1025529)
-- Sylvestre Ledru <sylvestre@debian.org> Wed, 21 Dec 2022 13:48:40 +0100 -- Sylvestre Ledru <sylvestre@debian.org> Wed, 21 Dec 2022 13:48:40 +0100

41
debian/patches/link-grpc.diff vendored Normal file
View File

@ -0,0 +1,41 @@
Index: llvm-toolchain-14-14.0.6/llvm/cmake/modules/FindGRPC.cmake
===================================================================
--- llvm-toolchain-14-14.0.6.orig/llvm/cmake/modules/FindGRPC.cmake
+++ llvm-toolchain-14-14.0.6/llvm/cmake/modules/FindGRPC.cmake
@@ -73,10 +73,27 @@ else()
endif()
endif()
endif()
+
+ find_library(GPR_LIBRARY gpr $GRPC_OPTS REQUIRED)
+ add_library(gpr UNKNOWN IMPORTED GLOBAL)
+ message(STATUS "Using gpr: " ${GPR_LIBRARY})
+ set_target_properties(gpr PROPERTIES IMPORTED_LOCATION ${GPR_LIBRARY})
+
find_library(GRPC_LIBRARY grpc++ $GRPC_OPTS REQUIRED)
add_library(grpc++ UNKNOWN IMPORTED GLOBAL)
message(STATUS "Using grpc++: " ${GRPC_LIBRARY})
set_target_properties(grpc++ PROPERTIES IMPORTED_LOCATION ${GRPC_LIBRARY})
+
+ find_library(GRPC2_LIBRARY grpc $GRPC_OPTS REQUIRED)
+ add_library(grpc UNKNOWN IMPORTED GLOBAL)
+ message(STATUS "Using grpc: " ${GRPC2_LIBRARY})
+ set_target_properties(grpc PROPERTIES IMPORTED_LOCATION ${GRPC2_LIBRARY})
+
+ find_library(ABSL_SYNCHRONIZATION_LIBRARY absl_synchronization $GRPC_OPTS REQUIRED)
+ add_library(absl_synchronization UNKNOWN IMPORTED GLOBAL)
+ message(STATUS "Using absl_synchronization: " ${ABSL_SYNCHRONIZATION_LIBRARY})
+ set_target_properties(absl_synchronization PROPERTIES IMPORTED_LOCATION ${ABSL_SYNCHRONIZATION_LIBRARY})
+
if (ENABLE_GRPC_REFLECTION)
find_library(GRPC_REFLECTION_LIBRARY grpc++_reflection $GRPC_OPTS REQUIRED)
add_library(grpc++_reflection UNKNOWN IMPORTED GLOBAL)
@@ -123,7 +140,7 @@ function(generate_protos LibraryName Pro
add_clang_library(${LibraryName} ${GeneratedProtoSource}
PARTIAL_SOURCES_INTENDED
- LINK_LIBS PUBLIC grpc++ protobuf)
+ LINK_LIBS PUBLIC protobuf gpr grpc absl_synchronization grpc++)
# Ensure dependency headers are generated before dependent protos are built.
# DEPENDS arg is a list of "Foo.proto". While they're logically relative to

1
debian/patches/series vendored
View File

@ -161,3 +161,4 @@ lldb/lldb-swig.diff
lldb/lldb-swig-2.diff lldb/lldb-swig-2.diff
protobuf_3.21.patch protobuf_3.21.patch
basic_string.patch basic_string.patch
link-grpc.diff