Pārlūkot izejas kodu

brpc 1.3.0 add patch (#1541)

* add patch

* update patch
igavintang 2 gadi atpakaļ
vecāks
revīzija
845d5b6cd7
2 mainītis faili ar 21 papildinājumiem un 3 dzēšanām
  1. 20 0
      packages/b/brpc/patches/1.3.0/cmake.patch
  2. 1 3
      packages/b/brpc/xmake.lua

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

@@ -0,0 +1,20 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9edc0a68..8b2ad743 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -210,14 +210,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()
+ 
+ set(BRPC_PRIVATE_LIBS "-lgflags -lprotobuf -lleveldb -lprotoc -lssl -lcrypto -ldl -lz")

+ 1 - 3
packages/b/brpc/xmake.lua

@@ -4,6 +4,7 @@ package("brpc")
 
     add_urls("https://github.com/apache/incubator-brpc.git")
     add_versions("1.3.0", "a90cf60714941632b2986826336a7c50cbd3d530")
+    add_patches("1.3.0", path.join(os.scriptdir(), "patches", "1.3.0", "cmake.patch"), "a71bf46a4a6038a89da3ee9057dea5f452155a2da1f1c9bdcae7ecd0bb5e0510")
 
     add_deps("protobuf-cpp 3.19.4")
     add_deps("leveldb", "gflags", "openssl", "libzip")
@@ -17,9 +18,6 @@ package("brpc")
     end
 
     on_install("linux", "macosx", function (package)
-        io.replace("CMakeLists.txt", "${OPENSSL_CRYPTO_LIBRARY}", "", {plain = true})
-        io.replace("CMakeLists.txt", "list(APPEND DYNAMIC_LIB ${OPENSSL_SSL_LIBRARY})",
-            "list(APPEND DYNAMIC_LIB ${OPENSSL_SSL_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY})", {plain = true})
         local configs = {"-DWITH_DEBUG_SYMBOLS=OFF", "-DCMAKE_EXPORT_COMPILE_COMMANDS=ON"}
         import("package.tools.cmake").install(package, configs)
         if not package:config("shared") then