This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-doris.git
The following commit(s) were added to refs/heads/master by this push:
new 9f26c6a34f [chore] fix some compatible on old linux distributions
(#9815)
9f26c6a34f is described below
commit 9f26c6a34fa59a822b122ea885b434d9cd73278a
Author: Zhengguo Yang <yangz...@gmail.com>
AuthorDate: Thu Jun 2 10:37:10 2022 +0800
[chore] fix some compatible on old linux distributions (#9815)
---
thirdparty/build-thirdparty.sh | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
diff --git a/thirdparty/build-thirdparty.sh b/thirdparty/build-thirdparty.sh
index 8cf569e4be..a352f9a3ab 100755
--- a/thirdparty/build-thirdparty.sh
+++ b/thirdparty/build-thirdparty.sh
@@ -312,14 +312,17 @@ build_protobuf() {
LDFLAGS="-L${TP_LIB_DIR} -static-libstdc++ -static-libgcc
-Wl,--undefined=pthread_create" \
./configure --prefix=${TP_INSTALL_DIR} --disable-shared --enable-static
--with-zlib=${TP_INSTALL_DIR}/include
- # ATTN: If protoc is built fully statically with clang-14 on ubuntu,
- # it may core dump when parse some protobuf source files.
- # The root cause remains unknown, but it is possibly related glibc...
- # And, we don't actually need to be that static,
- # dyn-linking to glibc and etc. is OK
- # cd src
- # sed -i 's/^AM_LDFLAGS\(.*\)$/AM_LDFLAGS\1 -all-static/' Makefile
- # cd -
+ # ATTN: If protoc is not built fully statically the linktime libc may
newer than runtime.
+ # This will casue protoc cannot run
+ # If you really need to dynamically link protoc, please set the
environment variable DYN_LINK_PROTOC=1
+
+ if [[ "${DYN_LINK_PROTOC}" == "1" ]]; then
+ echo "link protoc dynamiclly"
+ else
+ cd src
+ sed -i 's/^AM_LDFLAGS\(.*\)$/AM_LDFLAGS\1 -all-static/' Makefile
+ cd -
+ fi
make -j $PARALLEL && make install
}
@@ -677,6 +680,7 @@ build_arrow() {
-Dzstd_SOURCE=SYSTEM \
-DSnappy_LIB=$TP_INSTALL_DIR/lib/libsnappy.a
-DSnappy_INCLUDE_DIR=$TP_INSTALL_DIR/include \
-DSnappy_SOURCE=SYSTEM \
+ -DBOOST_ROOT=$TP_INSTALL_DIR --no-warn-unused-cli \
-DThrift_ROOT=$TP_INSTALL_DIR ..
${BUILD_SYSTEM} -j $PARALLEL && ${BUILD_SYSTEM} install
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
