Skip to content

add patch to remove libunwind for glog #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
imay merged 1 commit into from
Aug 31, 2017
Merged

add patch to remove libunwind for glog #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions thirdparty/build-thirdparty.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down Expand Up @@ -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
}

Expand Down
1 change: 1 addition & 0 deletions thirdparty/download-thirdparty.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -
Expand Down
31 changes: 31 additions & 0 deletions thirdparty/patches/glog-0.3.3-remove-unwind-dependency.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"