Repository: incubator-impala Updated Branches: refs/heads/master a81ad5eaa -> 60c41c4f0
IMPALA-4652: Add crcutil to build Add crcutil, built from a git hash since there are no released versions, to Impala's build. crcutil is available at https://github.com/rurban/crcutil FindCrcutil.cmake was taken from Apache Kudu. Change-Id: I095d1c6b8e9e8f40cf62c1ecfdc880e708a72c28 Reviewed-on: http://gerrit.cloudera.org:8080/5660 Reviewed-by: Henry Robinson <[email protected]> Tested-by: Henry Robinson <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/incubator-impala/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-impala/commit/60c41c4f Tree: http://git-wip-us.apache.org/repos/asf/incubator-impala/tree/60c41c4f Diff: http://git-wip-us.apache.org/repos/asf/incubator-impala/diff/60c41c4f Branch: refs/heads/master Commit: 60c41c4f0fcfbd241cbf4163b09fbe7b28a98e81 Parents: a81ad5e Author: Henry Robinson <[email protected]> Authored: Tue Nov 8 11:11:26 2016 -0800 Committer: Henry Robinson <[email protected]> Committed: Thu Jan 12 23:50:14 2017 +0000 ---------------------------------------------------------------------- CMakeLists.txt | 6 ++++++ bin/bootstrap_toolchain.py | 4 ++-- bin/impala-config.sh | 1 + cmake_modules/FindCrcutil.cmake | 40 ++++++++++++++++++++++++++++++++++++ 4 files changed, 49 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/60c41c4f/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/CMakeLists.txt b/CMakeLists.txt index e0339d6..6a17714 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -72,6 +72,7 @@ set_dep_root(AVRO) set_dep_root(BOOST) set_dep_root(BREAKPAD) set_dep_root(BZIP2) +set_dep_root(CRCUTIL) set_dep_root(GCC) set_dep_root(GFLAGS) set_dep_root(GLOG) @@ -316,6 +317,11 @@ include_directories(SYSTEM ${LIBEV_INCLUDE_DIR}) ADD_THIRDPARTY_LIB(libev STATIC_LIB "${LIBEV_STATIC_LIB}") +find_package(Crcutil REQUIRED) +include_directories(SYSTEM ${CRCUTIL_INCLUDE_DIR}) +ADD_THIRDPARTY_LIB(crcutil + STATIC_LIB "${CRCUTIL_STATIC_LIB}") + ################################################################### # KuduClient can use GLOG http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/60c41c4f/bin/bootstrap_toolchain.py ---------------------------------------------------------------------- diff --git a/bin/bootstrap_toolchain.py b/bin/bootstrap_toolchain.py index 1434862..349cd60 100755 --- a/bin/bootstrap_toolchain.py +++ b/bin/bootstrap_toolchain.py @@ -349,8 +349,8 @@ if __name__ == "__main__": if not os.path.exists(toolchain_root): os.makedirs(toolchain_root) - packages = ["avro", "binutils", "boost", "breakpad", "bzip2", "cmake", "gcc", "gflags", - "glog", "gperftools", "gtest", "kudu", "libev", "llvm", + packages = ["avro", "binutils", "boost", "breakpad", "bzip2", "cmake", "crcutil", "gcc", + "gflags", "glog", "gperftools", "gtest", "kudu", "libev", "llvm", ("llvm", "3.8.0-asserts-p1"), "lz4", "openldap", "protobuf", "rapidjson", "re2", "snappy", "thrift", "tpc-h", "tpc-ds", "zlib"] bootstrap(toolchain_root, packages) http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/60c41c4f/bin/impala-config.sh ---------------------------------------------------------------------- diff --git a/bin/impala-config.sh b/bin/impala-config.sh index 2e72027..84f2880 100755 --- a/bin/impala-config.sh +++ b/bin/impala-config.sh @@ -82,6 +82,7 @@ export IMPALA_BOOST_VERSION=1.57.0 export IMPALA_BREAKPAD_VERSION=20150612-p1 export IMPALA_BZIP2_VERSION=1.0.6-p2 export IMPALA_CMAKE_VERSION=3.2.3-p1 +export IMPALA_CRCUTIL_VERSION=440ba7babeff77ffad992df3a10c767f184e946e export IMPALA_CYRUS_SASL_VERSION=2.1.23 export IMPALA_GCC_VERSION=4.9.2 export IMPALA_GFLAGS_VERSION=2.0 http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/60c41c4f/cmake_modules/FindCrcutil.cmake ---------------------------------------------------------------------- diff --git a/cmake_modules/FindCrcutil.cmake b/cmake_modules/FindCrcutil.cmake new file mode 100644 index 0000000..f6ec2b1 --- /dev/null +++ b/cmake_modules/FindCrcutil.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 CRCUTIL (crcutil/include.h, libcrcutil.a) +# This module defines +# CRCUTIL_INCLUDE_DIR, directory containing headers +# CRCUTIL_SHARED_LIB, path to libcrcutil's shared library +# CRCUTIL_STATIC_LIB, path to libcrcutil's static library +# CRCUTIL_FOUND, whether crcutil has been found + +find_path(CRCUTIL_INCLUDE_DIR crcutil/interface.h + PATHS ${CRCUTIL_ROOT}/include + NO_CMAKE_SYSTEM_PATH + NO_SYSTEM_ENVIRONMENT_PATH) +find_library(CRCUTIL_SHARED_LIB crcutil + PATHS ${CRCUTIL_ROOT}/lib + NO_CMAKE_SYSTEM_PATH + NO_SYSTEM_ENVIRONMENT_PATH) +find_library(CRCUTIL_STATIC_LIB libcrcutil.a + PATHS ${CRCUTIL_ROOT}/lib + NO_CMAKE_SYSTEM_PATH + NO_SYSTEM_ENVIRONMENT_PATH) + +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(CRCUTIL REQUIRED_VARS + CRCUTIL_SHARED_LIB CRCUTIL_STATIC_LIB CRCUTIL_INCLUDE_DIR)
