[kudu] branch master updated: [util] added zlib as dependency for libcurl

[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 914efea  [util] added zlib as dependency for libcurl
914efea is described below

commit 914efea217b0c80b1454a7664e61b7c00bf8a8a5
Author: Alexey Serbin <ale...@apache.org>
AuthorDate: Mon Feb 10 13:55:36 2020 -0800

    [util] added zlib as dependency for libcurl
    
    After switching to libcurl from the thirdparty but prior to this patch,
    the standard linker on CentOS6 would output errors like below when
    building Kudu in RELEASE configuration:
    
      devtoolset-3/root/usr/libexec/gcc/x86_64-redhat-linux/4.9.2/ld:
         
thirdparty/installed/uninstrumented/lib/libcurl.a(libcurl_la-content_encoding.o):
         undefined reference to symbol 'inflateInit2_'
      //lib64/libz.so.1: error adding symbols: DSO missing from command line
      collect2: error: ld returned 1 exit status
    
    This is a follow-up to 5c610bf40543feca7ed934e9fe1ebbbcccd6c265.
    
    Change-Id: I76ed772845a7e7a00b0ee023dfac51595af383ca
    Reviewed-on: http://gerrit.cloudera.org:8080/15200
    Reviewed-by: Adar Dembo <a...@cloudera.com>
    Tested-by: Kudu Jenkins
---
 CMakeLists.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4852891..eab71a3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1070,7 +1070,8 @@ find_package(CURL REQUIRED)
 include_directories(SYSTEM ${CURL_INCLUDE_DIR})
 ADD_THIRDPARTY_LIB(curl
   STATIC_LIB "${CURL_STATIC_LIB}"
-  SHARED_LIB "${CURL_SHARED_LIB}")
+  SHARED_LIB "${CURL_SHARED_LIB}"
+  DEPS zlib)
 
 ## crcutil
 find_package(Crcutil REQUIRED)