Fix RPM based distro sasl2 dependencies in build scripts

rnpridgeon · rnpridgeon · commit 4a235983a53e · 2019-03-27T22:11:25.000-04:00
diff --git a/tools/build-linux-selfcontained.sh b/tools/build-linux-selfcontained.sh
@@ -80,7 +80,7 @@ function install_deps {
     if which apt-get >/dev/null 2>&1; then
         sudo apt-get -y install gcc g++ zlib1g-dev libsasl2-dev
     else
-        yum install -y zlib-devel gcc gcc-c++ libstdc++-devel libsasl2-dev
+        yum install -y zlib-devel gcc gcc-c++ libstdc++-devel cyrus-sasl-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++ libsasl2-dev
+yum install -y zlib-devel gcc-c++ cyrus-sasl-devel
 
 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++ libsasl2-dev
+yum install -y zlib-devel gcc-c++ cyrus-sasl-devel
 
 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
`@@ -80,7 +80,7 @@ function install_deps {`
`80`	`80`	`if which apt-get >/dev/null 2>&1; then`
`81`	`81`	`sudo apt-get -y install gcc g++ zlib1g-dev libsasl2-dev`
`82`	`82`	`else`
`83`		`- yum install -y zlib-devel gcc gcc-c++ libstdc++-devel libsasl2-dev`
	`83`	`+ yum install -y zlib-devel gcc gcc-c++ libstdc++-devel cyrus-sasl-devel`
`84`	`84`	`fi`
`85`	`85`	`}`
`86`	`86`
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++ libsasl2-dev`
	`47`	`+yum install -y zlib-devel gcc-c++ cyrus-sasl-devel`
`48`	`48`
`49`	`49`	`echo "# Building librdkafka ${LIBRDKAFKA_VERSION}"`
`50`	`50`	`$(dirname $0)/bootstrap-librdkafka.sh --require-ssl ${LIBRDKAFKA_VERSION} /usr`