diff --git a/ports/braft/fix-dependency.patch b/ports/braft/fix-dependency.patch index b39ba03fa6..d875f352d5 100644 --- a/ports/braft/fix-dependency.patch +++ b/ports/braft/fix-dependency.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 53ddaed..a851c00 100644 +index 53ddaed..3d75dd5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -47,8 +47,9 @@ if ((NOT LEVELDB_INCLUDE_PATH) OR (NOT LEVELDB_LIB)) @@ -14,3 +14,18 @@ index 53ddaed..a851c00 100644 if ((NOT GFLAGS_INCLUDE_PATH) OR (NOT GFLAGS_LIB)) message(FATAL_ERROR "Fail to find gflags") endif() +@@ -77,13 +78,7 @@ if (NOT PROTOBUF_PROTOC_EXECUTABLE) + set (PROTOBUF_PROTOC_EXECUTABLE "${PROTO_LIB_DIR}/../bin/protoc") + endif() + +-if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") +- set(OPENSSL_ROOT_DIR +- "/usr/local/opt/openssl" # Homebrew installed OpenSSL +- ) +-endif() +- +-include(FindOpenSSL) ++find_package(OpenSSL REQUIRED) + + include_directories( + ${GFLAGS_INCLUDE_PATH} diff --git a/ports/braft/vcpkg.json b/ports/braft/vcpkg.json index 8d2eaf5abd..e5f3023639 100644 --- a/ports/braft/vcpkg.json +++ b/ports/braft/vcpkg.json @@ -1,7 +1,7 @@ { "name": "braft", "version-date": "2021-26-04", - "port-version": 3, + "port-version": 4, "description": "Consensus algorithm library", "homepage": "https://github.com/baidu/braft", "license": "Apache-2.0", diff --git a/ports/brpc/vcpkg.json b/ports/brpc/vcpkg.json index fbe909f937..4d394cfce7 100644 --- a/ports/brpc/vcpkg.json +++ b/ports/brpc/vcpkg.json @@ -1,11 +1,11 @@ { "name": "brpc", "version": "1.6.1", - "port-version": 1, + "port-version": 2, "description": "Industrial-grade RPC framework used throughout Baidu, with 1,000,000+ instances and thousands kinds of services, called \"baidu-rpc\" inside Baidu.", "homepage": "https://github.com/apache/incubator-brpc", "license": "Apache-2.0", - "supports": "!windows & !arm", + "supports": "!windows & !(arm & android)", "dependencies": [ "gflags", "glog", diff --git a/versions/b-/braft.json b/versions/b-/braft.json index 2dc7c3b258..f2ed00ebd2 100644 --- a/versions/b-/braft.json +++ b/versions/b-/braft.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b376168dcf6ec1336dd980ae419f8dcd626bc41b", + "version-date": "2021-26-04", + "port-version": 4 + }, { "git-tree": "af9ff158d1a8f1284b9cc78d4ec816b0a37c7a3d", "version-date": "2021-26-04", diff --git a/versions/b-/brpc.json b/versions/b-/brpc.json index 040f0f42b7..4036d7dd4b 100644 --- a/versions/b-/brpc.json +++ b/versions/b-/brpc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3fd0bfb30a96852a7a92e0526c411ef9f95bed83", + "version": "1.6.1", + "port-version": 2 + }, { "git-tree": "5460a635b3cfa64a9857a378a798ded7f60abc74", "version": "1.6.1", diff --git a/versions/baseline.json b/versions/baseline.json index 4235f22d03..2f4f6db0d7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1334,7 +1334,7 @@ }, "braft": { "baseline": "2021-26-04", - "port-version": 3 + "port-version": 4 }, "breakpad": { "baseline": "2023-01-27", @@ -1350,7 +1350,7 @@ }, "brpc": { "baseline": "1.6.1", - "port-version": 1 + "port-version": 2 }, "brunocodutra-metal": { "baseline": "2.1.4",