Use librdkafka ./configure's auto installation of dependencies

edenhill · edenhill · commit 76f829eb75a6 · 2019-03-12T14:36:38.000+01:00
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -1,6 +1,6 @@
 environment:
   global:
-    LIBRDKAFKA_NUGET_VERSION: 1.0.0-RC7
+    LIBRDKAFKA_NUGET_VERSION: 1.0.0-RC8
     CIBW_SKIP: cp33-* cp34-*
     CIBW_TEST_REQUIRES: pytest requests avro
     # SDK v7.0 MSVC Express 2008's SetEnv.cmd script will fail if the
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,6 @@
 env:
  global:
-  - LIBRDKAFKA_VERSION=v1.0.0-RC7
+  - LIBRDKAFKA_VERSION=v1.0.0-RC8
 matrix:
  include:
   # Source package verification with Python 2.7
diff --git a/tools/bootstrap-librdkafka.sh b/tools/bootstrap-librdkafka.sh
@@ -34,14 +34,15 @@ curl -q -L "https://github.com/edenhill/librdkafka/archive/${VERSION}.tar.gz" |
 
 ./configure --clean
 make clean
-./configure --prefix="$INSTALLDIR"
+./configure --install-deps --source-deps-only --prefix="$INSTALLDIR"
 
 if [[ $REQUIRE_SSL == 1 ]]; then
     grep '^#define WITH_SSL 1$' config.h || \
         (echo "ERROR: OpenSSL support required" ; cat config.log config.h ; exit 1)
 fi
 
 make -j
+examples/rdkafka_example -X builtin.features
 
 if [[ $INSTALLDIR == /usr && $(whoami) != root ]]; then
     sudo make install
diff --git a/tools/build-linux-selfcontained.sh b/tools/build-linux-selfcontained.sh
@@ -78,13 +78,9 @@ LIBRDKAFKA_VERSION=$1
 function install_deps {
     echo "# Installing basic system dependencies"
     if which apt-get >/dev/null 2>&1; then
-        sudo apt-get -y install gcc g++ zlib1g-dev libssl-dev
+        sudo apt-get -y install gcc g++ zlib1g-dev
     else
         yum install -y zlib-devel gcc gcc-c++ libstdc++-devel
-
-        # Build OpenSSL
-        tools/build-openssl.sh /usr
-
     fi
 }
 
diff --git a/tools/build-manylinux.sh b/tools/build-manylinux.sh
@@ -46,9 +46,6 @@ fi
 echo "# Installing basic system dependencies"
 yum install -y zlib-devel gcc-c++
 
-# Build OpenSSL
-$(dirname $0)/build-openssl.sh /usr
-
 echo "# Building librdkafka ${LIBRDKAFKA_VERSION}"
 $(dirname $0)/bootstrap-librdkafka.sh --require-ssl ${LIBRDKAFKA_VERSION} /usr
 
diff --git a/tools/prepare-cibuildwheel-linux.sh b/tools/prepare-cibuildwheel-linux.sh
@@ -15,9 +15,6 @@ set -ex
 echo "# Installing basic system dependencies"
 yum install -y zlib-devel gcc-c++
 
-# Build OpenSSL
-$(dirname $0)/build-openssl.sh /usr
-
 echo "# Building librdkafka ${LIBRDKAFKA_VERSION}"
 $(dirname $0)/bootstrap-librdkafka.sh --require-ssl ${LIBRDKAFKA_VERSION} /usr
 
