jprdonnelly/impala
1
0
Fork 0
mirror of https://github.com/apache/impala.git synced 2025-12-23 21:08:39 -05:00
Code Issues Projects Releases Wiki Activity

IMPALA-5659: Begin standardizing treatment of thirdparty libraries

Browse Source 
If Impala was built with --build_shared_libs, some thirdparty libraries
were still statically linked; this could cause runtime errors if the
libraries were also linked into a .so. This patch fixes that issue (for
gflags, glog and protobuf at least) by ensuring that build_shared_libs
is respected for those libraries.

* Standardize thirdparty library handling w/CMake by adding
  IMPALA_ADD_THIRDPARTY_LIB. This creates a symbolic name for each
  library, allowing us to switch the underlying library
  files (e.g. change from static to dynamic linking) without having to
  individually change the link clauses for each target.

* Remove most cases of add_library() from cmake_modules/* - that is all
  handled by IMPALA_ADD_THIRDPARTY_LIB.

* Add shared library detection for a couple of thirdparty
  dependencies (many only detect static libraries), just to prove the concept.

* All thirdparty libraries now print a standard set of messages. For example:

-- ----------> Adding thirdparty library protoc. <----------
-- Header files: /data/henry/src/cloudera/impala-toolchain/protobuf-2.6.1/include
-- Added shared library dependency protoc: /data/henry/src/cloudera/impala-toolchain/protobuf-2.6.1/lib/libprotoc.so
-- ----------> Adding thirdparty library libev. <----------
-- Header files: /data/henry/src/cloudera/impala-toolchain/libev-4.20/include
-- Added shared library dependency libev: /data/henry/src/cloudera/impala-toolchain/libev-4.20/lib/libev.so

* Some libraries don't quite fit this pattern (LLVM and Boost) - leave
  them as is for now.

* Remove FindOpenSSL.cmake - the toolchain one is more modern.

Change-Id: Ib7a6bc5610aaf2450f91348d94cfb984c6a4b78d
Reviewed-on: http://gerrit.cloudera.org:8080/7418
Tested-by: Impala Public Jenkins
Reviewed-by: Tim Armstrong <tarmstrong@cloudera.com>
This commit is contained in:
Henry Robinson
2017-07-13 13:03:54 -07:00
parent bc2250f84f
commit d79e01ef9f
18 changed files with 155 additions and 301 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmake_modules/FindAvro.cmake
View File

@@ -22,7 +22,6 @@
# AVRO_INCLUDE_DIR, directory containing headers
# AVRO_STATIC_LIB, path to libavrocpp_s.a
# AVRO_FOUND
# avro - static library
set(AVRO_SEARCH_HEADER_PATHS
${AVRO_ROOT}/include
$ENV{IMPALA_HOME}/thirdparty/avro-c-$ENV{IMPALA_AVRO_VERSION}/src)
@@ -45,8 +44,6 @@ if(NOT AVRO_STATIC_LIB)
set(AVRO_FOUND FALSE)
else()
set(AVRO_FOUND TRUE)
add_library(avro STATIC IMPORTED)
set_target_properties(avro PROPERTIES IMPORTED_LOCATION "${AVRO_STATIC_LIB}")
endif ()
set(AVRO_FOUND ${AVRO_STATIC_LIB_FOUND})
@@ -55,5 +52,4 @@ mark_as_advanced(
AVRO_INCLUDE_DIR
AVRO_STATIC_LIB
AVRO_FOUND
avro
)