This is an automated email from the ASF dual-hosted git repository.
adonisling pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.0 by this push:
new 32aacc46bc [chore](third-party) Fix the build order for libunwind
(#22244) (#22289)
32aacc46bc is described below
commit 32aacc46bc18c3abcebcb7bdac3a6238af5fde8b
Author: Adonis Ling <adonis0...@gmail.com>
AuthorDate: Thu Jul 27 14:52:50 2023 +0800
[chore](third-party) Fix the build order for libunwind (#22244) (#22289)
1. libunwind depends on lzma
2. Fix the missing headers issues reported by GCC-13
---
be/src/common/stack_trace.h | 1 +
thirdparty/build-thirdparty.sh | 6 +++---
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/be/src/common/stack_trace.h b/be/src/common/stack_trace.h
index 1bd60c2870..7e6ae14a4c 100644
--- a/be/src/common/stack_trace.h
+++ b/be/src/common/stack_trace.h
@@ -22,6 +22,7 @@
#include <array>
#include <csignal>
+#include <cstdint>
#include <functional>
#include <optional>
#include <string>
diff --git a/thirdparty/build-thirdparty.sh b/thirdparty/build-thirdparty.sh
index 2c7f75d6a1..1f376d0d68 100755
--- a/thirdparty/build-thirdparty.sh
+++ b/thirdparty/build-thirdparty.sh
@@ -1450,8 +1450,8 @@ build_libunwind() {
# LIBUNWIND_NO_HEAP: https://reviews.llvm.org/D11897
# LIBUNWIND_IS_NATIVE_ONLY:
https://lists.llvm.org/pipermail/cfe-commits/Week-of-Mon-20160523/159802.html
# -nostdinc++ only required for gcc compilation
- cflags='-std=c99 -D_LIBUNWIND_NO_HEAP=1 -D_DEBUG
-D_LIBUNWIND_IS_NATIVE_ONLY -O3 -fno-exceptions -funwind-tables
-fno-sanitize=all -nostdinc++ -fno-rtti'
- CFLAGS="${cflags}" ../configure --prefix="${TP_INSTALL_DIR}"
+ cflags="-I${TP_INCLUDE_DIR} -std=c99 -D_LIBUNWIND_NO_HEAP=1 -D_DEBUG
-D_LIBUNWIND_IS_NATIVE_ONLY -O3 -fno-exceptions -funwind-tables
-fno-sanitize=all -nostdinc++ -fno-rtti"
+ CFLAGS="${cflags}" LDFLAGS="-L${TP_LIB_DIR} -llzma" ../configure
--prefix="${TP_INSTALL_DIR}" --disable-shared --enable-static
make -j "${PARALLEL}"
make install
@@ -1616,7 +1616,6 @@ build_hadoop_libs() {
if [[ "${#packages[@]}" -eq 0 ]]; then
packages=(
- libunwind
libunixodbc
openssl
libevent
@@ -1674,6 +1673,7 @@ if [[ "${#packages[@]}" -eq 0 ]]; then
xxhash
concurrentqueue
fast_float
+ libunwind
)
if [[ "$(uname -s)" == 'Darwin' ]]; then
read -r -a packages <<<"binutils gettext ${packages[*]}"
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
