Bläddra i källkod

brpc: fix build (#8314)

apocelipes 2 månader sedan
förälder
incheckning
8c95d115c4
2 ändrade filer med 21 tillägg och 2 borttagningar
  1. 17 0
      packages/b/brpc/patches/1.14.1/cmake.patch
  2. 4 2
      packages/b/brpc/xmake.lua

+ 17 - 0
packages/b/brpc/patches/1.14.1/cmake.patch

@@ -0,0 +1,17 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 92f7114..a56a7b1 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -306,11 +306,10 @@ if(WITH_BORINGSSL)
+     list(APPEND DYNAMIC_LIB ${BORINGSSL_SSL_LIBRARY})
+     list(APPEND DYNAMIC_LIB ${BORINGSSL_CRYPTO_LIBRARY})
+ else()
+-    list(APPEND DYNAMIC_LIB ${OPENSSL_CRYPTO_LIBRARY})
+     if(WITH_MESALINK)
+         list(APPEND DYNAMIC_LIB ${MESALINK_LIB})
+     else()
+-        list(APPEND DYNAMIC_LIB ${OPENSSL_SSL_LIBRARY})
++        list(APPEND DYNAMIC_LIB ${OPENSSL_SSL_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY})
+     endif()
+ endif()
+ 

+ 4 - 2
packages/b/brpc/xmake.lua

@@ -5,6 +5,7 @@ package("brpc")
 
     add_urls("https://github.com/apache/brpc/archive/refs/tags/$(version).tar.gz")
 
+    add_versions("1.14.1", "9d07cf40e7c6c70210b032cd69b0b525459d204ebb8068ca93678c13807e2af1")
     add_versions("1.10.0", "fe4eb10b4ca1a59e0f71086552b2d8897afd66df93b53c18ad83f6a93717cc2d")
     add_versions("1.8.0", "13ffb2f1f57c679379a20367c744b3e597614a793ec036cd7580aae90798019d")
     add_versions("1.7.0", "48668cbc943edd1b72551e99c58516249d15767b46ea13a843eb8df1d3d1bc42")
@@ -13,6 +14,7 @@ package("brpc")
     add_versions("1.5.0", "5ce178e3070ecdf9576a8917e3f65d96085f437bfbf9f1d09d46bca1375938cf")
     add_versions("1.3.0", "b9d638b76725552ed11178c650d7fc95e30f252db7972a93dc309a0698c7d2b8")
 
+    add_patches("1.14.1", path.join(os.scriptdir(), "patches", "1.14.1", "cmake.patch"), "04de26217d7fef37cf6e4d072cc65d767cf7d363b936d8cd652235be6f11e0c9")
     add_patches("1.10.0", path.join(os.scriptdir(), "patches", "1.8.0", "cmake.patch"), "315889dcca66331932a8ce90bbdc5f71e336ca39d625ff85a589ee2bf10155ee")
     add_patches("1.8.0", path.join(os.scriptdir(), "patches", "1.8.0", "cmake.patch"), "315889dcca66331932a8ce90bbdc5f71e336ca39d625ff85a589ee2bf10155ee")
     add_patches("1.7.0", path.join(os.scriptdir(), "patches", "1.7.0", "cmake.patch"), "801920d6fcd20f3da68c1846dc22d26d2d320e48b06b6b5bd38bbed11e5ebd2c")
@@ -27,8 +29,8 @@ package("brpc")
     add_deps("cmake")
 
     if is_plat("macosx") then
-        add_frameworks("Foundation", "CoreFoundation", "Security", "CoreGraphics", "CoreText")
-        add_ldflags("-Wl,-U,_ProfilerStart", "-Wl,-U,_ProfilerStop")
+        add_frameworks("Foundation", "CoreFoundation", "Security", "CoreGraphics", "CoreText", "CoreData")
+        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")
     elseif is_plat("linux") then
         add_syslinks("rt", "dl")
     end