浏览代码

Add brpc version 1.4.0 & improve add_urls (#1822)

igavintang 2 年之前
父节点
当前提交
4e42baa069
共有 2 个文件被更改,包括 24 次插入2 次删除
  1. 20 0
      packages/b/brpc/patches/1.4.0/cmake.patch
  2. 4 2
      packages/b/brpc/xmake.lua

+ 20 - 0
packages/b/brpc/patches/1.4.0/cmake.patch

@@ -0,0 +1,20 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 35365b27..c393ec8f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -225,14 +225,13 @@ set(DYNAMIC_LIB
+     ${CMAKE_THREAD_LIBS_INIT}
+     ${THRIFT_LIB}
+     ${THRIFTNB_LIB}
+-    ${OPENSSL_CRYPTO_LIBRARY}
+     dl
+     z)
+ 
+ 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()
+ 
+ if(WITH_RDMA)

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

@@ -2,8 +2,10 @@ package("brpc")
     set_homepage("https://github.com/apache/incubator-brpc")
     set_description("brpc is an Industrial-grade RPC framework using C++ Language, which is often used in high performance system such as Search, Storage, Machine learning, Advertisement, Recommendation etc.")
 
-    add_urls("https://github.com/apache/incubator-brpc.git")
-    add_versions("1.3.0", "a90cf60714941632b2986826336a7c50cbd3d530")
+    add_urls("https://github.com/apache/brpc/archive/refs/tags/$(version).tar.gz")
+    add_versions("1.4.0", "6ea39d8984217f62ef954b7ebc0dfa724c62472a5ae7033ed189f994f28b9e30")
+    add_patches("1.4.0", path.join(os.scriptdir(), "patches", "1.4.0", "cmake.patch"), "006fa842e84a6e8091f236a12e7c44dd60962cc61fddf46bcfc65a2093383cef")
+    add_versions("1.3.0", "b9d638b76725552ed11178c650d7fc95e30f252db7972a93dc309a0698c7d2b8")
     add_patches("1.3.0", path.join(os.scriptdir(), "patches", "1.3.0", "cmake.patch"), "a71bf46a4a6038a89da3ee9057dea5f452155a2da1f1c9bdcae7ecd0bb5e0510")
 
     -- we enable zlib in protobuf-cpp, because brpc need google/protobuf/io/gzip_stream.h