This is an automated email from the ASF dual-hosted git repository.
adonisling pushed a commit to branch branch-1.2-lts
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-1.2-lts by this push:
new 5d54649ffb [chore](third-party) Fix errors while building brpc
(#23339) (#23350)
5d54649ffb is described below
commit 5d54649ffbe0dbff135e91718ca37ceca623804c
Author: Adonis Ling <[email protected]>
AuthorDate: Wed Aug 23 09:37:07 2023 +0800
[chore](third-party) Fix errors while building brpc (#23339) (#23350)
Cherry pick #23339
---
thirdparty/build-thirdparty.sh | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/thirdparty/build-thirdparty.sh b/thirdparty/build-thirdparty.sh
index ac6850a094..784cfcb852 100755
--- a/thirdparty/build-thirdparty.sh
+++ b/thirdparty/build-thirdparty.sh
@@ -799,6 +799,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`
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
