[kudu] branch master updated: [thirdparty] use system curl for cmake

[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 da28907  [thirdparty] use system curl for cmake
da28907 is described below

commit da2890729a51276b367783f06d792dbddffaf49d
Author: Alexey Serbin <ale...@apache.org>
AuthorDate: Tue Feb 9 22:48:13 2021 -0800

    [thirdparty] use system curl for cmake
    
    Since building Kudu from source requires curl to be installed,
    let's rely on that system package when building cmake.  In addition
    to reducing the build time of the third-party components, it also
    helps avoiding build failures in environments where multiple
    OpenSSL versions are installed.
    
    I guess a proper fix would be updating cmake configure/build scripts
    and makefiles, but I'm not sure it's worth it: removing an extra
    component from the build gives the benefit of shorter build times.
    
    Change-Id: I10a22e1e864b19491177c25a352e2378a6f6dea3
    Reviewed-on: http://gerrit.cloudera.org:8080/17053
    Tested-by: Kudu Jenkins
    Reviewed-by: Grant Henke <granthe...@apache.org>
---
 thirdparty/build-definitions.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/thirdparty/build-definitions.sh b/thirdparty/build-definitions.sh
index e6bf05b..a4ac427 100644
--- a/thirdparty/build-definitions.sh
+++ b/thirdparty/build-definitions.sh
@@ -89,11 +89,17 @@ fixup_libtool() {
 }
 
 build_cmake() {
+  # Use system curl if it is available: this shortens build times a bit.
+  local use_system_curl=""
+  if pkg-config --exists libcurl; then
+    use_system_curl="--system-curl"
+  fi
   CMAKE_BDIR=$TP_BUILD_DIR/$CMAKE_NAME$MODE_SUFFIX
   mkdir -p $CMAKE_BDIR
   pushd $CMAKE_BDIR
   $CMAKE_SOURCE/bootstrap \
     --prefix=$PREFIX \
+    $use_system_curl \
     --parallel=$PARALLEL -- \
     -DBUILD_TESTING=OFF
   # Unfortunately, cmake's bootstrap always uses Makefiles