加入 Gitee
与超过 1200万 开发者一起发现、参与优秀开源项目,私有仓库也完全免费 :)
免费加入
文件
该仓库未声明开源许可证文件(LICENSE),使用请关注具体项目描述及其代码上游依赖。
克隆/下载
repair-pkgconfig-path.patch 1.49 KB
一键复制 编辑 原始数据 按行查看 历史
sherlock2010 提交于 2023-08-03 08:10 . upgrade grpc to 1.54.2
From: bitcoffee<854182924@qq.com>
Reason: pkgconfig install path write dead in the file, modify it
diff -urN grpc/cmake/pkg-config-template.pc.in grpc_new/cmake/pkg-config-template.pc.in
--- grpc/cmake/pkg-config-template.pc.in 2020-08-21 14:34:20.512037605 +0800
+++ grpc_new/cmake/pkg-config-template.pc.in 2020-08-27 20:47:46.372035834 +0800
@@ -1,7 +1,7 @@
prefix=@CMAKE_INSTALL_PREFIX@
exec_prefix=${prefix}
-includedir=${prefix}/@gRPC_INSTALL_INCLUDEDIR@
+includedir=${prefix}/include
-libdir=${exec_prefix}/@gRPC_INSTALL_LIBDIR@
+libdir=${exec_prefix}/lib64
Name: @PC_NAME@
Description: @PC_DESCRIPTION@
diff -urN grpc/CMakeLists.txt grpc_new/CMakeLists.txt
--- grpc/CMakeLists.txt 2020-08-24 09:14:14.361862041 +0800
+++ grpc_new/CMakeLists.txt 2020-08-27 14:50:00.371507303 +0800
@@ -42,6 +42,7 @@
set(gRPC_INSTALL_CMAKEDIR "lib/cmake/${PACKAGE_NAME}" CACHE STRING "Installation directory for cmake config files")
set(gRPC_INSTALL_SHAREDIR "share/grpc" CACHE STRING "Installation directory for root certificates")
set(gRPC_BUILD_MSVC_MP_COUNT 0 CACHE STRING "The maximum number of processes for MSVC /MP option")
+set(gRPC_INSTALL_PKGCONFIGDIR "lib/pkgconfig" CACHE STRING "Installation directory for pkgconfig")
# Options
option(gRPC_BUILD_TESTS "Build tests" OFF)
@@ -15666,7 +15667,7 @@
"${output_filepath}"
@ONLY)
install(FILES "${output_filepath}"
- DESTINATION "${gRPC_INSTALL_LIBDIR}/pkgconfig")
+ DESTINATION ${gRPC_INSTALL_PKGCONFIGDIR})
endfunction()
# gpr .pc file
马建仓 AI 助手
尝试更多
代码解读
代码找茬
代码优化