瀏覽代碼

Auto-update brpc to 1.8.0 (#3542)

* Update brpc to 1.8.0

* add patch

---------

Co-authored-by: star9029 <[email protected]>
ruki 1 年之前
父節點
當前提交
4542859277
共有 2 個文件被更改,包括 26 次插入4 次删除
  1. 17 0
      packages/b/brpc/patches/1.8.0/cmake.patch
  2. 9 4
      packages/b/brpc/xmake.lua

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

@@ -0,0 +1,17 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0a70bb1..7dd74f5 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -283,11 +283,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()
+ 

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

@@ -1,17 +1,22 @@
 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.")
+    set_license("Apache-2.0")
 
     add_urls("https://github.com/apache/brpc/archive/refs/tags/$(version).tar.gz")
+
+    add_versions("1.8.0", "13ffb2f1f57c679379a20367c744b3e597614a793ec036cd7580aae90798019d")
     add_versions("1.7.0", "48668cbc943edd1b72551e99c58516249d15767b46ea13a843eb8df1d3d1bc42")
-    add_patches("1.7.0", path.join(os.scriptdir(), "patches", "1.7.0", "cmake.patch"), "801920d6fcd20f3da68c1846dc22d26d2d320e48b06b6b5bd38bbed11e5ebd2c")
     add_versions("1.6.1", "d9eb93683b0e4cb583aacdf2357c3e3e613fbf797c4fafd0eae1d09d5ea50964")
-    add_patches("1.6.1", path.join(os.scriptdir(), "patches", "1.6.1", "cmake.patch"), "046e590994ad302127d4cb7b1b2d8231db5f7c30c3948a0172d0dca9bef1da0b")
+    add_versions("1.4.0", "6ea39d8984217f62ef954b7ebc0dfa724c62472a5ae7033ed189f994f28b9e30")
     add_versions("1.5.0", "5ce178e3070ecdf9576a8917e3f65d96085f437bfbf9f1d09d46bca1375938cf")
+    add_versions("1.3.0", "b9d638b76725552ed11178c650d7fc95e30f252db7972a93dc309a0698c7d2b8")
+
+    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")
+    add_patches("1.6.1", path.join(os.scriptdir(), "patches", "1.6.1", "cmake.patch"), "046e590994ad302127d4cb7b1b2d8231db5f7c30c3948a0172d0dca9bef1da0b")
     add_patches("1.5.0", path.join(os.scriptdir(), "patches", "1.5.0", "cmake.patch"), "af6eb76c9eccedaba1ff39d8f36280a09f0476848b24ef5330a350cd06900244")
-    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