This is an automated email from the ASF dual-hosted git repository.
adonisling pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new a5382043d7 [chore](third-party) Fix errors while building brpc (#23339)
a5382043d7 is described below
commit a5382043d7606b94a56388d89953f59b39837502
Author: Adonis Ling <[email protected]>
AuthorDate: Wed Aug 23 09:13:06 2023 +0800
[chore](third-party) Fix errors while building brpc (#23339)
close #23340
---
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 163ed452d7..ec8aa049b9 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]
