This is an automated email from the ASF dual-hosted git repository.
adonisling pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.0 by this push:
new 041e4527c6 [chore](third-party) Fix errors while building brpc
(#23339) (#23347)
041e4527c6 is described below
commit 041e4527c686cadf99e96c0d8580290380d7ce6d
Author: Adonis Ling <[email protected]>
AuthorDate: Wed Aug 23 09:34:27 2023 +0800
[chore](third-party) Fix errors while building brpc (#23339) (#23347)
Cherry pick #23339
---
thirdparty/build-thirdparty.sh | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/thirdparty/build-thirdparty.sh b/thirdparty/build-thirdparty.sh
index c8459fbc1b..ab62802cd0 100755
--- a/thirdparty/build-thirdparty.sh
+++ b/thirdparty/build-thirdparty.sh
@@ -805,6 +805,10 @@ build_brpc() {
ldflags="-L${TP_LIB_DIR} -static-libstdc++ -static-libgcc"
else
ldflags="-L${TP_LIB_DIR}"
+
+ # Don't set OPENSSL_ROOT_DIR
+ sed '/set(OPENSSL_ROOT_DIR/,/)/ d' ../CMakeLists.txt
>../CMakeLists.txt.bak
+ mv ../CMakeLists.txt.bak ../CMakeLists.txt
fi
# Currently, BRPC can't be built for static libraries only (without .so).
Therefore, we should add `-fPIC`
@@ -812,7 +816,7 @@ build_brpc() {
LDFLAGS="${ldflags}" \
"${CMAKE_CMD}" -G "${GENERATOR}" -DBUILD_SHARED_LIBS=1 -DWITH_GLOG=ON
-DCMAKE_INSTALL_PREFIX="${TP_INSTALL_DIR}" \
-DCMAKE_LIBRARY_PATH="${TP_INSTALL_DIR}/lib64"
-DCMAKE_INCLUDE_PATH="${TP_INSTALL_DIR}/include" \
- -DBUILD_BRPC_TOOLS=OFF -DBUILD_SHARED_LIBS=OFF \
+ -DBUILD_BRPC_TOOLS=OFF \
-DPROTOBUF_PROTOC_EXECUTABLE="${TP_INSTALL_DIR}/bin/protoc" ..
"${BUILD_SYSTEM}" -j "${PARALLEL}"
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
