More travis fixes

edenhill · edenhill · commit dcc0a9119538 · 2017-09-05T16:57:23.000+02:00
diff --git a/.travis.yml b/.travis.yml
@@ -20,7 +20,7 @@ matrix:
     env: LD_LIBRARY_PATH="$PWD/tmp-build/lib" LIBRDKAFKA_VERSION=v0.9.2
   # cibuildwheel for osx
   - os: osx
-    env: CIBW_BEFORE_BUILD="tools/bootstrap-librdkafka.sh master tmp" CFLAGS="-Itmp/include" LDFLAGS="-Ltmp/lib"
+    env: CIBW_BEFORE_BUILD="tools/bootstrap-librdkafka.sh --require-ssl master tmp" CFLAGS="-Itmp/include" LDFLAGS="-Ltmp/lib"
   # cibuildwheel for manylinux
   - os: linux
     dist: trusty
@@ -31,7 +31,7 @@ matrix:
     services: docker
 
 install:
- - if [[ -z $CIBW_BEFORE_BUILD ]]; then rm -rf tmp-build ; bash tools/bootstrap-librdkafka.sh ${LIBRDKAFKA_VERSION} tmp-build ; fi
+ - if [[ -z $CIBW_BEFORE_BUILD ]]; then rm -rf tmp-build ; tools/bootstrap-librdkafka.sh --require-ssl ${LIBRDKAFKA_VERSION} tmp-build ; fi
  - if [[ -z $CIBW_BEFORE_BUILD ]]; then pip install --upgrade pip && pip install pytest-timeout flake8 ; fi
  - if [[ ! -z $CIBW_BEFORE_BUILD ]]; then pip install cibuildwheel==0.4.1 ; fi
 
diff --git a/tools/bootstrap-librdkafka.sh b/tools/bootstrap-librdkafka.sh
@@ -39,8 +39,8 @@ make clean
 ./configure --prefix="$PREFIXDIR"
 
 if [[ $REQUIRE_SSL == 1 ]]; then
-    grep '^#define WITH_SSL 2$' config.h || \
-        (echo "ERROR: OpenSSL support required" ; cat config.log ; exit 1)
+    grep '^#define WITH_SSL 1$' config.h || \
+        (echo "ERROR: OpenSSL support required" ; cat config.log config.h ; exit 1)
 fi
 
 make -j
diff --git a/tools/build-manylinux.sh b/tools/build-manylinux.sh
@@ -50,7 +50,7 @@ yum install -y zlib-devel gcc-c++
 $(dirname $0)/build-openssl.sh /usr
 
 echo "# Building librdkafka ${LIBRDKAFKA_VERSION}"
-$(dirname $0)/bootstrap-librdkafka.sh ${LIBRDKAFKA_VERSION} /usr
+$(dirname $0)/bootstrap-librdkafka.sh --require-ssl ${LIBRDKAFKA_VERSION} /usr
 
 # Compile wheels
 echo "# Compile"
diff --git a/tools/build-openssl.sh b/tools/build-openssl.sh
@@ -32,12 +32,12 @@ fi
 
 ./config --prefix=${PREFIX} zlib no-krb5 zlib shared
 echo "## building openssl"
-if ! time make -j 2>&1 | tail -20 ; then
+if ! make -j 2>&1 | tail -20 ; then
     echo "## Make failed, cleaning up and retrying"
     time make clean 2>&1 | tail -20
     rm -f test/PASSED
     echo "## building openssl (retry)"
-    time make -j 2>&1 | tail -20 ; then
+    time make -j 2>&1 | tail -20
 fi
 
 if [[ ! -f test/PASSED ]]; then
diff --git a/tools/prepare-cibuildwheel-linux.sh b/tools/prepare-cibuildwheel-linux.sh
@@ -19,5 +19,5 @@ yum install -y zlib-devel gcc-c++
 $(dirname $0)/build-openssl.sh /usr
 
 echo "# Building librdkafka ${LIBRDKAFKA_VERSION}"
-$(dirname $0)/bootstrap-librdkafka.sh ${LIBRDKAFKA_VERSION} /usr
+$(dirname $0)/bootstrap-librdkafka.sh --require-ssl ${LIBRDKAFKA_VERSION} /usr
 
