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 3904447 [fix](toolchain) Allow building when system contains
libunwind (#7866)
3904447 is described below
commit 3904447db87f11072f4125695a5f7c92658a1912
Author: Amos Bird <amosb...@gmail.com>
AuthorDate: Sat Jan 29 12:33:32 2022 +0800
[fix](toolchain) Allow building when system contains libunwind (#7866)
---
thirdparty/build-thirdparty.sh | 6 ++----
thirdparty/patches/glog-0.4.0.patch | 12 ++++++++++++
2 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/thirdparty/build-thirdparty.sh b/thirdparty/build-thirdparty.sh
index a73a4ab..eea591e 100755
--- a/thirdparty/build-thirdparty.sh
+++ b/thirdparty/build-thirdparty.sh
@@ -527,10 +527,8 @@ build_brpc() {
mkdir -p $BUILD_DIR && cd $BUILD_DIR
rm -rf CMakeCache.txt CMakeFiles/
LDFLAGS="-L${TP_LIB_DIR} -static-libstdc++ -static-libgcc" \
- ${CMAKE_CMD} -G "${GENERATOR}" -DBUILD_SHARED_LIBS=0
-DCMAKE_INSTALL_PREFIX=$TP_INSTALL_DIR \
- -DCMAKE_LIBRARY_PATH=$TP_INSTALL_DIR/lib64 \
- -DBRPC_WITH_GLOG=ON -DWITH_GLOG=ON
-DGFLAGS_LIBRARY=$TP_INSTALL_DIR/lib/libgflags.a -DGLOG_LIB=$TP_INSTALL_DIR/lib
\
- -DGFLAGS_INCLUDE_PATH=$TP_INSTALL_DIR/include
-DGLOG_LIB=$TP_INSTALL_DIR/lib/libglog.a
-DCMAKE_INCLUDE_PATH="$TP_INSTALL_DIR/include" \
+ ${CMAKE_CMD} -G "${GENERATOR}" -DBUILD_SHARED_LIBS=0 -DWITH_GLOG=ON
-DCMAKE_INSTALL_PREFIX=$TP_INSTALL_DIR \
+ -DCMAKE_LIBRARY_PATH=$TP_INSTALL_DIR/lib64
-DCMAKE_INCLUDE_PATH="$TP_INSTALL_DIR/include" \
-DPROTOBUF_PROTOC_EXECUTABLE=$TP_INSTALL_DIR/bin/protoc ..
${BUILD_SYSTEM} -j $PARALLEL && ${BUILD_SYSTEM} install
}
diff --git a/thirdparty/patches/glog-0.4.0.patch
b/thirdparty/patches/glog-0.4.0.patch
index 12b6ea5..1ba0af2 100644
--- a/thirdparty/patches/glog-0.4.0.patch
+++ b/thirdparty/patches/glog-0.4.0.patch
@@ -338,3 +338,15 @@ diff -uprN a/src/logging.cc b/src/logging.cc
}
// Write to LOG file
+diff -uprN a/configure.ac b/configure.ac
+--- a/configure.ac 2022-01-24 22:47:23.776890869 +0800
++++ b/configure.ac 2022-01-24 22:47:03.418891534 +0800
+@@ -38,7 +38,7 @@ AC_CHECK_HEADERS(sys/syscall.h)
+ # For backtrace with glibc.
+ AC_CHECK_HEADERS(execinfo.h)
+ # For backtrace with libunwind.
+-AC_CHECK_HEADERS(libunwind.h, ac_cv_have_libunwind_h=1,
ac_cv_have_libunwind_h=0)
++# AC_CHECK_HEADERS(libunwind.h, ac_cv_have_libunwind_h=1,
ac_cv_have_libunwind_h=0)
+ AC_CHECK_HEADERS(ucontext.h)
+ AC_CHECK_HEADERS(sys/utsname.h)
+ AC_CHECK_HEADERS(pwd.h)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
