diff --git a/thirdparty/build-thirdparty.sh b/thirdparty/build-thirdparty.sh index 273df818e83812..530e1efc56b86f 100755 --- a/thirdparty/build-thirdparty.sh +++ b/thirdparty/build-thirdparty.sh @@ -266,7 +266,7 @@ build_glog() { CPPFLAGS="-I${TP_INCLUDE_DIR}" \ LDFLAGS="-L${TP_LIB_DIR}" \ CFLAGS="-fPIC" \ - ./configure --prefix=$TP_INSTALL_DIR + ./configure --prefix=$TP_INSTALL_DIR --enable-frame-pointers make -j$PARALLEL && make install } @@ -328,7 +328,7 @@ build_gperftools() { LDFLAGS="-L${TP_LIB_DIR}" \ LD_LIBRARY_PATH="${TP_LIB_DIR}" \ CFLAGS="-fPIC" \ - ./configure --prefix=$TP_INSTALL_DIR --disable-libunwind --with-pic + ./configure --prefix=$TP_INSTALL_DIR --disable-libunwind --with-pic --enable-frame-pointers make -j$PARALLEL && make install } diff --git a/thirdparty/download-thirdparty.sh b/thirdparty/download-thirdparty.sh index aa62aa74471c0c..803e40780a2898 100755 --- a/thirdparty/download-thirdparty.sh +++ b/thirdparty/download-thirdparty.sh @@ -147,6 +147,7 @@ cd $TP_SOURCE_DIR/$GLOG_SOURCE if [ ! -f $PATCHED_MARK ]; then patch -p1 < $TP_PATCH_DIR/glog-0.3.3-vlog-double-lock-bug.patch patch -p1 < $TP_PATCH_DIR/glog-0.3.3-for-palo2.patch + patch -p1 < $TP_PATCH_DIR/glog-0.3.3-remove-unwind-dependency.patch touch $PATCHED_MARK fi cd - diff --git a/thirdparty/patches/glog-0.3.3-remove-unwind-dependency.patch b/thirdparty/patches/glog-0.3.3-remove-unwind-dependency.patch new file mode 100644 index 00000000000000..d0bdf841cc2f5a --- /dev/null +++ b/thirdparty/patches/glog-0.3.3-remove-unwind-dependency.patch @@ -0,0 +1,31 @@ +--- glog-0.3.3/src/utilities.h.orig 2017-08-31 15:38:59.050406303 +0800 ++++ glog-0.3.3/src/utilities.h 2017-08-31 15:40:02.015350365 +0800 +@@ -101,17 +101,17 @@ + // correctly when GetStackTrace() is called with max_depth == 0. + // Some code may do that. + +-#if defined(HAVE_LIB_UNWIND) +-# define STACKTRACE_H "stacktrace_libunwind-inl.h" +-#elif !defined(NO_FRAME_POINTER) +-# if defined(__i386__) && __GNUC__ >= 2 +-# define STACKTRACE_H "stacktrace_x86-inl.h" +-# elif defined(__x86_64__) && __GNUC__ >= 2 && HAVE_UNWIND_H +-# define STACKTRACE_H "stacktrace_x86_64-inl.h" +-# elif (defined(__ppc__) || defined(__PPC__)) && __GNUC__ >= 2 +-# define STACKTRACE_H "stacktrace_powerpc-inl.h" +-# endif +-#endif ++// #if defined(HAVE_LIB_UNWIND) ++// # define STACKTRACE_H "stacktrace_libunwind-inl.h" ++// #elif !defined(NO_FRAME_POINTER) ++// # if defined(__i386__) && __GNUC__ >= 2 ++// # define STACKTRACE_H "stacktrace_x86-inl.h" ++// # elif defined(__x86_64__) && __GNUC__ >= 2 && HAVE_UNWIND_H ++// # define STACKTRACE_H "stacktrace_x86_64-inl.h" ++// # elif (defined(__ppc__) || defined(__PPC__)) && __GNUC__ >= 2 ++// # define STACKTRACE_H "stacktrace_powerpc-inl.h" ++// # endif ++// #endif + + #if !defined(STACKTRACE_H) && defined(HAVE_EXECINFO_H) + # define STACKTRACE_H "stacktrace_generic-inl.h"