3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-15 12:08:06 +08:00
Code Issues Projects Releases Wiki Activity

[brpc] x64-linux-dynamic link error(brpc.so undefined reference to leveldb (#37379)

Browse Source
This commit is contained in:
FredyVia 2024-03-14 07:03:59 +08:00 committed by GitHub
parent bdc038b4f6
commit bd32ee6cc3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ports/brpc/fix-build.patch
View File

@ -1,5 +1,5 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4ac815d6..dbb9b7ee 100644 index f364cd13..f4add26d 100644
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -66,7 +66,8 @@ endif() @@ -66,7 +66,8 @@ endif()
@ -91,7 +91,7 @@ index dfad5fd8..8423d55a 100644
set(GFLAGS_FOUND TRUE) set(GFLAGS_FOUND TRUE)
endif(GFLAGS_INCLUDE_PATH AND GFLAGS_LIBRARY) endif(GFLAGS_INCLUDE_PATH AND GFLAGS_LIBRARY)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index fbcc7cc5..95037a0d 100644 index fbcc7cc5..868270ea 100644
--- a/src/CMakeLists.txt --- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt +++ b/src/CMakeLists.txt
@@ -31,16 +31,24 @@ add_dependencies(SOURCES_LIB PROTO_LIB) @@ -31,16 +31,24 @@ add_dependencies(SOURCES_LIB PROTO_LIB)
@ -121,7 +121,7 @@ index fbcc7cc5..95037a0d 100644
# for protoc-gen-mcpack # for protoc-gen-mcpack
set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/output/bin) set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/output/bin)
@@ -49,35 +57,62 @@ set(protoc_gen_mcpack_SOURCES @@ -49,35 +57,63 @@ set(protoc_gen_mcpack_SOURCES
) )
add_executable(protoc-gen-mcpack ${protoc_gen_mcpack_SOURCES}) add_executable(protoc-gen-mcpack ${protoc_gen_mcpack_SOURCES})
@ -131,7 +131,7 @@ index fbcc7cc5..95037a0d 100644
add_library(brpc-shared SHARED $<TARGET_OBJECTS:BUTIL_LIB> add_library(brpc-shared SHARED $<TARGET_OBJECTS:BUTIL_LIB>
$<TARGET_OBJECTS:SOURCES_LIB> $<TARGET_OBJECTS:SOURCES_LIB>
$<TARGET_OBJECTS:PROTO_LIB>) $<TARGET_OBJECTS:PROTO_LIB>)
- target_link_libraries(brpc-shared ${DYNAMIC_LIB}) target_link_libraries(brpc-shared ${DYNAMIC_LIB})
+ target_include_directories(brpc-shared PUBLIC $<INSTALL_INTERFACE:include>) + target_include_directories(brpc-shared PUBLIC $<INSTALL_INTERFACE:include>)
if(BRPC_WITH_GLOG) if(BRPC_WITH_GLOG)
target_link_libraries(brpc-shared ${GLOG_LIB}) target_link_libraries(brpc-shared ${GLOG_LIB})

8
ports/brpc/fix-glog.patch
View File

@ -1,5 +1,5 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt
index f4add26..b87e845 100644 index f4add26d..b87e8455 100644
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -80,9 +80,10 @@ include(GNUInstallDirs) @@ -80,9 +80,10 @@ include(GNUInstallDirs)
@ -54,7 +54,7 @@ index f4add26..b87e845 100644
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
#required by butil/crc32.cc to boost performance for 10x #required by butil/crc32.cc to boost performance for 10x
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 95037a0..24007d7 100644 index 868270ea..a70ad23f 100644
--- a/src/CMakeLists.txt --- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt +++ b/src/CMakeLists.txt
@@ -31,6 +31,10 @@ add_dependencies(SOURCES_LIB PROTO_LIB) @@ -31,6 +31,10 @@ add_dependencies(SOURCES_LIB PROTO_LIB)
@ -78,9 +78,9 @@ index 95037a0..24007d7 100644
target_include_directories(brpc-static PUBLIC $<INSTALL_INTERFACE:include>) target_include_directories(brpc-static PUBLIC $<INSTALL_INTERFACE:include>)
SET_TARGET_PROPERTIES(brpc-static PROPERTIES OUTPUT_NAME brpc CLEAN_DIRECT_OUTPUT 1) SET_TARGET_PROPERTIES(brpc-static PROPERTIES OUTPUT_NAME brpc CLEAN_DIRECT_OUTPUT 1)
@@ -64,9 +65,6 @@ if(BUILD_SHARED_LIBS) @@ -65,9 +66,6 @@ if(BUILD_SHARED_LIBS)
$<TARGET_OBJECTS:SOURCES_LIB>
$<TARGET_OBJECTS:PROTO_LIB>) $<TARGET_OBJECTS:PROTO_LIB>)
target_link_libraries(brpc-shared ${DYNAMIC_LIB})
target_include_directories(brpc-shared PUBLIC $<INSTALL_INTERFACE:include>) target_include_directories(brpc-shared PUBLIC $<INSTALL_INTERFACE:include>)
- if(BRPC_WITH_GLOG) - if(BRPC_WITH_GLOG)
- target_link_libraries(brpc-shared ${GLOG_LIB}) - target_link_libraries(brpc-shared ${GLOG_LIB})

2
ports/brpc/vcpkg.json
View File

@ -1,7 +1,7 @@
{ {
"name": "brpc", "name": "brpc",
"version": "1.6.1", "version": "1.6.1",
"port-version": 2, "port-version": 3,
"description": "Industrial-grade RPC framework used throughout Baidu, with 1,000,000+ instances and thousands kinds of services, called \"baidu-rpc\" inside Baidu.", "description": "Industrial-grade RPC framework used throughout Baidu, with 1,000,000+ instances and thousands kinds of services, called \"baidu-rpc\" inside Baidu.",
"homepage": "https://github.com/apache/incubator-brpc", "homepage": "https://github.com/apache/incubator-brpc",
"license": "Apache-2.0", "license": "Apache-2.0",

5
versions/b-/brpc.json
View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "4aa97cf4dfb7c0ff2537a3b0e324daa97940d2c5",
"version": "1.6.1",
"port-version": 3
},
{ {
"git-tree": "3fd0bfb30a96852a7a92e0526c411ef9f95bed83", "git-tree": "3fd0bfb30a96852a7a92e0526c411ef9f95bed83",
"version": "1.6.1", "version": "1.6.1",

2
versions/baseline.json
View File

@ -1350,7 +1350,7 @@
}, },
"brpc": { "brpc": {
"baseline": "1.6.1", "baseline": "1.6.1",
"port-version": 2 "port-version": 3
}, },
"brunocodutra-metal": { "brunocodutra-metal": {
"baseline": "2.1.4", "baseline": "2.1.4",