Disable gssapi for linux wheel builds (confluentinc#566)

Ryan P · web-flow · commit 1ea35d0e3a8d · 2019-03-29T08:09:59.000-04:00
diff --git a/tools/bootstrap-librdkafka.sh b/tools/bootstrap-librdkafka.sh
@@ -34,7 +34,12 @@ curl -q -L "https://github.com/edenhill/librdkafka/archive/${VERSION}.tar.gz" |
 
 ./configure --clean
 make clean
-./configure --install-deps --source-deps-only --prefix="$INSTALLDIR"
+
+if [[ $OSTYPE == "linux"* ]]; then
+  EXTRA_OPTS="--disable-gssapi"
+fi
+
+./configure --install-deps --source-deps-only $EXTRA_OPTS --prefix="$INSTALLDIR"
 
 if [[ $REQUIRE_SSL == 1 ]]; then
     grep '^#define WITH_SSL 1$' config.h || \
diff --git a/tools/build-linux-selfcontained.sh b/tools/build-linux-selfcontained.sh
@@ -78,9 +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 libsasl2-dev
+        sudo apt-get -y install gcc g++ zlib1g-dev
     else
-        yum install -y zlib-devel gcc gcc-c++ libstdc++-devel cyrus-sasl-devel
+        yum install -y zlib-devel gcc gcc-c++ libstdc++-devel
     fi
 }
 
diff --git a/tools/build-manylinux.sh b/tools/build-manylinux.sh
@@ -44,7 +44,7 @@ fi
 #
 
 echo "# Installing basic system dependencies"
-yum install -y zlib-devel gcc-c++ cyrus-sasl-devel
+yum install -y zlib-devel gcc-c++
 
 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
@@ -13,7 +13,7 @@ fi
 set -ex
 
 echo "# Installing basic system dependencies"
-yum install -y zlib-devel gcc-c++ cyrus-sasl-devel
+yum install -y zlib-devel gcc-c++
 
 echo "# Building librdkafka ${LIBRDKAFKA_VERSION}"
 $(dirname $0)/bootstrap-librdkafka.sh --require-ssl ${LIBRDKAFKA_VERSION} /usr

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ fi`
`44`	`44`	`#`
`45`	`45`
`46`	`46`	`echo "# Installing basic system dependencies"`
`47`		`-yum install -y zlib-devel gcc-c++ cyrus-sasl-devel`
	`47`	`+yum install -y zlib-devel gcc-c++`
`48`	`48`
`49`	`49`	`echo "# Building librdkafka ${LIBRDKAFKA_VERSION}"`
`50`	`50`	`$(dirname $0)/bootstrap-librdkafka.sh --require-ssl ${LIBRDKAFKA_VERSION} /usr`