You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@impala.apache.org by ta...@apache.org on 2018/07/07 01:31:38 UTC
[2/3] impala git commit: Bump toolchain version, include libunwind
Bump toolchain version, include libunwind
Change-Id: I0b26f6a342dd7ba282c3f6c4de93745aff2dd095
Reviewed-on: http://gerrit.cloudera.org:8080/10755
Reviewed-by: Lars Volker <lv...@cloudera.com>
Tested-by: Impala Public Jenkins <im...@cloudera.com>
Project: http://git-wip-us.apache.org/repos/asf/impala/repo
Commit: http://git-wip-us.apache.org/repos/asf/impala/commit/837d3868
Tree: http://git-wip-us.apache.org/repos/asf/impala/tree/837d3868
Diff: http://git-wip-us.apache.org/repos/asf/impala/diff/837d3868
Branch: refs/heads/master
Commit: 837d386886759f7e884b145e74df83bfc013b2e2
Parents: c6f9b61
Author: Lars Volker <lv...@cloudera.com>
Authored: Mon Jun 4 15:14:52 2018 -0700
Committer: Impala Public Jenkins <im...@cloudera.com>
Committed: Fri Jul 6 22:06:03 2018 +0000
----------------------------------------------------------------------
CMakeLists.txt | 8 +++++++
be/CMakeLists.txt | 1 +
bin/bootstrap_toolchain.py | 2 +-
bin/impala-config.sh | 6 +++--
cmake_modules/FindLibUnwind.cmake | 40 ++++++++++++++++++++++++++++++++++
5 files changed, 54 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/impala/blob/837d3868/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2b8d563..77bf210 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -88,6 +88,7 @@ set_dep_root(GLOG)
set_dep_root(GPERFTOOLS)
set_dep_root(GTEST)
set_dep_root(LIBEV)
+set_dep_root(LIBUNWIND)
set_dep_root(LLVM)
set(LLVM_DEBUG_ROOT $ENV{IMPALA_TOOLCHAIN}/llvm-$ENV{IMPALA_LLVM_DEBUG_VERSION})
set_dep_root(LZ4)
@@ -343,6 +344,13 @@ endif()
###################################################################
+## libunwind
+if (NOT APPLE)
+ find_package(LibUnwind REQUIRED)
+ include_directories(SYSTEM ${LIBUNWIND_INCLUDE_DIR})
+ IMPALA_ADD_THIRDPARTY_LIB(libunwind ${LIBUNWIND_INCLUDE_DIR} ${LIBUNWIND_STATIC_LIB} "")
+endif()
+
# Required for KRPC_GENERATE, which converts protobuf to stubs.
find_package(KRPC REQUIRED)
http://git-wip-us.apache.org/repos/asf/impala/blob/837d3868/be/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/be/CMakeLists.txt b/be/CMakeLists.txt
index de94f5b..da78dad 100644
--- a/be/CMakeLists.txt
+++ b/be/CMakeLists.txt
@@ -443,6 +443,7 @@ set (IMPALA_DEPENDENCIES
gflags
krb5
libev
+ libunwind
pprof
breakpad_client
hdfs
http://git-wip-us.apache.org/repos/asf/impala/blob/837d3868/bin/bootstrap_toolchain.py
----------------------------------------------------------------------
diff --git a/bin/bootstrap_toolchain.py b/bin/bootstrap_toolchain.py
index 4a6009e..d2a3e71 100755
--- a/bin/bootstrap_toolchain.py
+++ b/bin/bootstrap_toolchain.py
@@ -426,7 +426,7 @@ if __name__ == "__main__":
# their download starts as soon as possible.
packages = map(Package, ["llvm", "kudu",
"avro", "binutils", "boost", "breakpad", "bzip2", "cctz", "cmake", "crcutil",
- "flatbuffers", "gcc", "gflags", "glog", "gperftools", "gtest", "libev",
+ "flatbuffers", "gcc", "gflags", "glog", "gperftools", "gtest", "libev", "libunwind",
"lz4", "openldap", "openssl", "orc", "protobuf",
"rapidjson", "re2", "snappy", "thrift", "tpc-h", "tpc-ds", "zlib"])
packages.insert(0, Package("llvm", "5.0.1-asserts"))
http://git-wip-us.apache.org/repos/asf/impala/blob/837d3868/bin/impala-config.sh
----------------------------------------------------------------------
diff --git a/bin/impala-config.sh b/bin/impala-config.sh
index b62c6a6..771ca2b 100755
--- a/bin/impala-config.sh
+++ b/bin/impala-config.sh
@@ -68,7 +68,7 @@ fi
# moving to a different build of the toolchain, e.g. when a version is bumped or a
# compile option is changed. The build id can be found in the output of the toolchain
# build jobs, it is constructed from the build number and toolchain git hash prefix.
-export IMPALA_TOOLCHAIN_BUILD_ID=107-764a0ddc79
+export IMPALA_TOOLCHAIN_BUILD_ID=137-93cacec18d
# Versions of toolchain dependencies.
# -----------------------------------
export IMPALA_AVRO_VERSION=1.7.4-p4
@@ -103,6 +103,8 @@ export IMPALA_GTEST_VERSION=1.6.0
unset IMPALA_GTEST_URL
export IMPALA_LIBEV_VERSION=4.20
unset IMPALA_LIBEV_URL
+export IMPALA_LIBUNWIND_VERSION=1.3-rc1-p3
+unset IMPALA_LIBUNWIND_URL
export IMPALA_LLVM_VERSION=5.0.1
unset IMPALA_LLVM_URL
export IMPALA_LLVM_ASAN_VERSION=5.0.1
@@ -120,7 +122,7 @@ export IMPALA_OPENSSL_VERSION=1.0.2l
unset IMPALA_OPENSSL_URL
export IMPALA_ORC_VERSION=1.4.3-p2
unset IMPALA_ORC_URL
-export IMPALA_PROTOBUF_VERSION=2.6.1
+export IMPALA_PROTOBUF_VERSION=3.5.1
unset IMPALA_PROTOBUF_URL
export IMPALA_POSTGRES_JDBC_DRIVER_VERSION=9.0-801
unset IMPALA_POSTGRES_JDBC_DRIVER_URL
http://git-wip-us.apache.org/repos/asf/impala/blob/837d3868/cmake_modules/FindLibUnwind.cmake
----------------------------------------------------------------------
diff --git a/cmake_modules/FindLibUnwind.cmake b/cmake_modules/FindLibUnwind.cmake
new file mode 100644
index 0000000..53f012c
--- /dev/null
+++ b/cmake_modules/FindLibUnwind.cmake
@@ -0,0 +1,40 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+# - Find libunwind (libunwind.h, libunwind.so)
+#
+# This module defines
+# LIBUNWIND_INCLUDE_DIR, directory containing headers
+# LIBUNWIND_SHARED_LIB, path to libunwind's shared library
+# LIBUNWIND_STATIC_LIB, path to libunwind's static library
+
+find_path(LIBUNWIND_INCLUDE_DIR libunwind.h
+ ${LIBUNWIND_ROOT}/include
+ NO_CMAKE_SYSTEM_PATH
+ NO_SYSTEM_ENVIRONMENT_PATH)
+find_library(LIBUNWIND_SHARED_LIB unwind
+ ${LIBUNWIND_ROOT}/lib
+ NO_CMAKE_SYSTEM_PATH
+ NO_SYSTEM_ENVIRONMENT_PATH)
+find_library(LIBUNWIND_STATIC_LIB libunwind.a
+ ${LIBUNWIND_ROOT}/lib
+ NO_CMAKE_SYSTEM_PATH
+ NO_SYSTEM_ENVIRONMENT_PATH)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(LIBUNWIND REQUIRED_VARS
+ LIBUNWIND_SHARED_LIB LIBUNWIND_STATIC_LIB LIBUNWIND_INCLUDE_DIR)