[kudu] branch master updated: [thirdparty] upgrade libunwind to 1.5.0

[alexey]

This is an automated email from the ASF dual-hosted git repository.

alexey pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kudu.git


The following commit(s) were added to refs/heads/master by this push:
     new ae95d6d  [thirdparty] upgrade libunwind to 1.5.0
ae95d6d is described below

commit ae95d6d5c10e375627d8b0aeab37b089933ccc92
Author: Alexey Serbin <ale...@apache.org>
AuthorDate: Tue Jun 22 16:21:14 2021 -0700

    [thirdparty] upgrade libunwind to 1.5.0
    
    With libunwind upgraded up to 1.5.0 version, it's now possible to build
    it with GCC 10.
    
    Another thing to note: libunwind 1.5.0 supports zlibdebuginfo feature
    and zlib is needed for that, so I moved zlib in the list of components
    before libunwind.
    
    Change-Id: I5964776133134d8ab17d69fc7ee0bc7457f98626
    Reviewed-on: http://gerrit.cloudera.org:8080/17625
    Tested-by: Alexey Serbin <aser...@cloudera.com>
    Reviewed-by: Alexey Serbin <aser...@cloudera.com>
---
 thirdparty/build-definitions.sh | 3 ++-
 thirdparty/build-thirdparty.sh  | 8 ++++----
 thirdparty/vars.sh              | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/thirdparty/build-definitions.sh b/thirdparty/build-definitions.sh
index 1b6a1c0..6177664 100644
--- a/thirdparty/build-definitions.sh
+++ b/thirdparty/build-definitions.sh
@@ -422,7 +422,8 @@ build_libunwind() {
   pushd $LIBUNWIND_BDIR
   # Disable minidebuginfo, which depends on liblzma, until/unless we decide to
   # add liblzma to thirdparty.
-  $LIBUNWIND_SOURCE/configure \
+  CFLAGS="$EXTRA_CFLAGS" \
+    $LIBUNWIND_SOURCE/configure \
     --disable-minidebuginfo \
     --with-pic \
     --prefix=$PREFIX
diff --git a/thirdparty/build-thirdparty.sh b/thirdparty/build-thirdparty.sh
index 4f4a842..1c6aa3c 100755
--- a/thirdparty/build-thirdparty.sh
+++ b/thirdparty/build-thirdparty.sh
@@ -461,14 +461,14 @@ EXTRA_CFLAGS="-fsanitize=thread $EXTRA_CFLAGS"
 EXTRA_CFLAGS="-g $EXTRA_CFLAGS"
 EXTRA_CXXFLAGS="-g $EXTRA_CXXFLAGS"
 
-if [ -n "$OS_LINUX" ] && [ -n "$F_TSAN" -o -n "$F_LIBUNWIND" ]; then
-  build_libunwind
-fi
-
 if [ -n "$F_TSAN" -o -n "$F_ZLIB" ]; then
   build_zlib
 fi
 
+if [ -n "$OS_LINUX" ] && [ -n "$F_TSAN" -o -n "$F_LIBUNWIND" ]; then
+  build_libunwind
+fi
+
 if [ -n "$F_TSAN" -o -n "$F_LZ4" ]; then
   build_lz4
 fi
diff --git a/thirdparty/vars.sh b/thirdparty/vars.sh
index bcad1e5..5d02ef5 100644
--- a/thirdparty/vars.sh
+++ b/thirdparty/vars.sh
@@ -137,7 +137,7 @@ CRCUTIL_VERSION=81f8a60f67190ff1e0c9f2f6e5a07f650671a646
 CRCUTIL_NAME=crcutil-$CRCUTIL_VERSION
 CRCUTIL_SOURCE=$TP_SOURCE_DIR/$CRCUTIL_NAME
 
-LIBUNWIND_VERSION=1.4.0
+LIBUNWIND_VERSION=1.5.0
 LIBUNWIND_NAME=libunwind-$LIBUNWIND_VERSION
 LIBUNWIND_SOURCE=$TP_SOURCE_DIR/$LIBUNWIND_NAME