Skip to content

Commit 8c95d11

Browse files
authored
brpc: fix build (#8314)
1 parent 3c2bfad commit 8c95d11

File tree

2 files changed

+21
-2
lines changed

2 files changed

+21
-2
lines changed
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
diff --git a/CMakeLists.txt b/CMakeLists.txt
2+
index 92f7114..a56a7b1 100644
3+
--- a/CMakeLists.txt
4+
+++ b/CMakeLists.txt
5+
@@ -306,11 +306,10 @@ if(WITH_BORINGSSL)
6+
list(APPEND DYNAMIC_LIB ${BORINGSSL_SSL_LIBRARY})
7+
list(APPEND DYNAMIC_LIB ${BORINGSSL_CRYPTO_LIBRARY})
8+
else()
9+
- list(APPEND DYNAMIC_LIB ${OPENSSL_CRYPTO_LIBRARY})
10+
if(WITH_MESALINK)
11+
list(APPEND DYNAMIC_LIB ${MESALINK_LIB})
12+
else()
13+
- list(APPEND DYNAMIC_LIB ${OPENSSL_SSL_LIBRARY})
14+
+ list(APPEND DYNAMIC_LIB ${OPENSSL_SSL_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY})
15+
endif()
16+
endif()
17+

packages/b/brpc/xmake.lua

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ package("brpc")
55

66
add_urls("https://github.com/apache/brpc/archive/refs/tags/$(version).tar.gz")
77

8+
add_versions("1.14.1", "9d07cf40e7c6c70210b032cd69b0b525459d204ebb8068ca93678c13807e2af1")
89
add_versions("1.10.0", "fe4eb10b4ca1a59e0f71086552b2d8897afd66df93b53c18ad83f6a93717cc2d")
910
add_versions("1.8.0", "13ffb2f1f57c679379a20367c744b3e597614a793ec036cd7580aae90798019d")
1011
add_versions("1.7.0", "48668cbc943edd1b72551e99c58516249d15767b46ea13a843eb8df1d3d1bc42")
@@ -13,6 +14,7 @@ package("brpc")
1314
add_versions("1.5.0", "5ce178e3070ecdf9576a8917e3f65d96085f437bfbf9f1d09d46bca1375938cf")
1415
add_versions("1.3.0", "b9d638b76725552ed11178c650d7fc95e30f252db7972a93dc309a0698c7d2b8")
1516

17+
add_patches("1.14.1", path.join(os.scriptdir(), "patches", "1.14.1", "cmake.patch"), "04de26217d7fef37cf6e4d072cc65d767cf7d363b936d8cd652235be6f11e0c9")
1618
add_patches("1.10.0", path.join(os.scriptdir(), "patches", "1.8.0", "cmake.patch"), "315889dcca66331932a8ce90bbdc5f71e336ca39d625ff85a589ee2bf10155ee")
1719
add_patches("1.8.0", path.join(os.scriptdir(), "patches", "1.8.0", "cmake.patch"), "315889dcca66331932a8ce90bbdc5f71e336ca39d625ff85a589ee2bf10155ee")
1820
add_patches("1.7.0", path.join(os.scriptdir(), "patches", "1.7.0", "cmake.patch"), "801920d6fcd20f3da68c1846dc22d26d2d320e48b06b6b5bd38bbed11e5ebd2c")
@@ -27,8 +29,8 @@ package("brpc")
2729
add_deps("cmake")
2830

2931
if is_plat("macosx") then
30-
add_frameworks("Foundation", "CoreFoundation", "Security", "CoreGraphics", "CoreText")
31-
add_ldflags("-Wl,-U,_ProfilerStart", "-Wl,-U,_ProfilerStop")
32+
add_frameworks("Foundation", "CoreFoundation", "Security", "CoreGraphics", "CoreText", "CoreData")
33+
add_ldflags("-Wl,-U,_MallocExtension_ReleaseFreeMemory", "-Wl,-U,_ProfilerStart", "-Wl,-U,_ProfilerStop", "-Wl,-U,__Z13GetStackTracePPvii", "-Wl,-U,_RegisterThriftProtocol", "-Wl,-U,_mallctl", "-Wl,-U,_malloc_stats_print")
3234
elseif is_plat("linux") then
3335
add_syslinks("rt", "dl")
3436
end

0 commit comments

Comments
 (0)