Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update dependency com_github_brpc_brpc to v1.8.0 #254

Merged
merged 2 commits into from
Feb 18, 2024
Merged

Update dependency com_github_brpc_brpc to v1.8.0 #254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
99895b8
Update dependency com_github_brpc_brpc to v1.8.0
renovate[bot] Jan 31, 2024
facdbbf
Update brpc patch
anakinxc Feb 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 8 additions & 17 deletions bazel/patches/brpc.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,20 +75,10 @@ index be02c50a..186abe54 100644
}
return true;
diff --git a/BUILD.bazel b/BUILD.bazel
index 5d317c90..5bb62a6e 100644
index 0bdaa4d3..b23881b3 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -45,13 +45,17 @@ COPTS = [
}) + select({
"//bazel/config:brpc_with_rdma": ["-DBRPC_WITH_RDMA=1"],
"//conditions:default": [""],
+}) + select({
+ # Force linux aarch to use O1 build
+ "@bazel_tools//src/conditions:linux_aarch64": ["-O1"],
+ "//conditions:default": [""],
})

LINKOPTS = [
@@ -51,7 +51,7 @@ LINKOPTS = [
"-pthread",
"-ldl",
] + select({
Expand All @@ -97,7 +87,7 @@ index 5d317c90..5bb62a6e 100644
"-framework CoreFoundation",
"-framework CoreGraphics",
"-framework CoreData",
@@ -215,7 +219,7 @@ BUTIL_SRCS = [
@@ -217,7 +217,7 @@ BUTIL_SRCS = [
"src/butil/recordio.cc",
"src/butil/popen.cpp",
] + select({
Expand All @@ -106,23 +96,24 @@ index 5d317c90..5bb62a6e 100644
"src/butil/time/time_mac.cc",
"src/butil/mac/scoped_mach_port.cc",
],
@@ -324,15 +328,14 @@ cc_library(
@@ -326,17 +326,17 @@ cc_library(
visibility = ["//visibility:public"],
deps = [
"@com_github_gflags_gflags//:gflags",
- "@com_github_madler_zlib//:zlib",
+ "@zlib//:zlib",
"@com_google_protobuf//:protobuf",
- "@openssl//:crypto",
- "@openssl//:ssl",
+ "@com_github_openssl_openssl//:openssl",
] + select({
"//bazel/config:brpc_with_glog": ["@com_github_google_glog//:glog"],
"//conditions:default": [],
}) + select({
- "@bazel_tools//tools/osx:darwin": [":macos_lib"],
+ "@bazel_tools//src/conditions:darwin": [":macos_lib"],
"//conditions:default": [],
}) + select({
"//bazel/config:brpc_with_boringssl": ["@boringssl//:ssl", "@boringssl//:crypto"],
- "//conditions:default": ["@openssl//:ssl", "@openssl//:crypto"],
+ "//conditions:default": ["@com_github_openssl_openssl//:openssl"],
}),
)

Expand Down
6 changes: 3 additions & 3 deletions bazel/repositories.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,16 +83,16 @@ def _com_github_brpc_brpc():
maybe(
http_archive,
name = "com_github_brpc_brpc",
sha256 = "48668cbc943edd1b72551e99c58516249d15767b46ea13a843eb8df1d3d1bc42",
strip_prefix = "brpc-1.7.0",
sha256 = "13ffb2f1f57c679379a20367c744b3e597614a793ec036cd7580aae90798019d",
strip_prefix = "brpc-1.8.0",
type = "tar.gz",
patch_args = ["-p1"],
patches = [
"@yacl//bazel:patches/brpc.patch",
"@yacl//bazel:patches/brpc_m1.patch",
],
urls = [
"https://github.com/apache/brpc/archive/refs/tags/1.7.0.tar.gz",
"https://github.com/apache/brpc/archive/refs/tags/1.8.0.tar.gz",
],
)

Expand Down
Loading