proxmox-mirrors/llvm-toolchain
1
0
Fork 0
mirror of https://git.proxmox.com/git/llvm-toolchain synced 2025-06-14 11:12:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

rebase of the patches

Browse Source
This commit is contained in:
Sylvestre Ledru 2023-01-01 15:53:13 +01:00
parent 476280f766
commit ab536f6e8c
1 changed files with 28 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
debian/patches/link-grpc.diff vendored
View File

@ -1,38 +1,37 @@
Index: llvm-toolchain-14-14.0.6/llvm/cmake/modules/FindGRPC.cmake
Index: llvm-toolchain-15-15.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,29 @@ else()
endif()
--- llvm-toolchain-15-15.0.6.orig/llvm/cmake/modules/FindGRPC.cmake
+++ llvm-toolchain-15-15.0.6/llvm/cmake/modules/FindGRPC.cmake
@@ -82,11 +82,28 @@ else()
endif()
endif()
if(NOT TARGET grpc++)
+ 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(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})
target_include_directories(grpc++ INTERFACE ${GRPC_INCLUDE_PATHS})
+ 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(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(ABSL_SYNCHRONIZATION_LIBRARY absl_synchronization $GRPC_OPTS REQUIRED)
+ if (ABSL_SYNCHRONIZATION_LIBRARY)
+ 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})
+ endif()
+
+ 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)
+ if (ABSL_SYNCHRONIZATION_LIBRARY)
+ 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})
+ endif()
+
if (ENABLE_GRPC_REFLECTION)
find_library(GRPC_REFLECTION_LIBRARY grpc++_reflection $GRPC_OPTS REQUIRED)
add_library(grpc++_reflection UNKNOWN IMPORTED GLOBAL)
@@ -121,9 +140,15 @@ function(generate_protos LibraryName Pro
if (ENABLE_GRPC_REFLECTION)
find_library(GRPC_REFLECTION_LIBRARY grpc++_reflection ${GRPC_OPTS} REQUIRED)
add_library(grpc++_reflection UNKNOWN IMPORTED GLOBAL)
@@ -132,9 +149,15 @@ function(generate_protos LibraryName Pro
ARGS ${Flags} "${ProtoSourceAbsolutePath}"
DEPENDS "${ProtoSourceAbsolutePath}")