Skip to content

Commit c8b79bc

Browse files
edenhillRyan P
authored andcommitted
Use librdkafka ./configure's auto installation of dependencies
1 parent 0ed0f09 commit c8b79bc

File tree

6 files changed

+5
-14
lines changed

6 files changed

+5
-14
lines changed

.appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
environment:
22
global:
3-
LIBRDKAFKA_NUGET_VERSION: 1.0.0-RC7
3+
LIBRDKAFKA_NUGET_VERSION: 1.0.0-RC8
44
CIBW_SKIP: cp33-* cp34-*
55
CIBW_TEST_REQUIRES: pytest requests avro
66
# SDK v7.0 MSVC Express 2008's SetEnv.cmd script will fail if the

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
env:
22
global:
3-
- LIBRDKAFKA_VERSION=v1.0.0-RC7
3+
- LIBRDKAFKA_VERSION=v1.0.0-RC8
44
matrix:
55
include:
66
# Source package verification with Python 2.7

tools/bootstrap-librdkafka.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,15 @@ curl -q -L "https://github.com/edenhill/librdkafka/archive/${VERSION}.tar.gz" |
3434

3535
./configure --clean
3636
make clean
37-
./configure --prefix="$INSTALLDIR"
37+
./configure --install-deps --source-deps-only --prefix="$INSTALLDIR"
3838

3939
if [[ $REQUIRE_SSL == 1 ]]; then
4040
grep '^#define WITH_SSL 1$' config.h || \
4141
(echo "ERROR: OpenSSL support required" ; cat config.log config.h ; exit 1)
4242
fi
4343

4444
make -j
45+
examples/rdkafka_example -X builtin.features
4546

4647
if [[ $INSTALLDIR == /usr && $(whoami) != root ]]; then
4748
sudo make install

tools/build-linux-selfcontained.sh

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,9 @@ LIBRDKAFKA_VERSION=$1
7878
function install_deps {
7979
echo "# Installing basic system dependencies"
8080
if which apt-get >/dev/null 2>&1; then
81-
sudo apt-get -y install gcc g++ zlib1g-dev libssl-dev
81+
sudo apt-get -y install gcc g++ zlib1g-dev
8282
else
8383
yum install -y zlib-devel gcc gcc-c++ libstdc++-devel
84-
85-
# Build OpenSSL
86-
tools/build-openssl.sh /usr
87-
8884
fi
8985
}
9086

tools/build-manylinux.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,6 @@ fi
4646
echo "# Installing basic system dependencies"
4747
yum install -y zlib-devel gcc-c++
4848

49-
# Build OpenSSL
50-
$(dirname $0)/build-openssl.sh /usr
51-
5249
echo "# Building librdkafka ${LIBRDKAFKA_VERSION}"
5350
$(dirname $0)/bootstrap-librdkafka.sh --require-ssl ${LIBRDKAFKA_VERSION} /usr
5451

tools/prepare-cibuildwheel-linux.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@ set -ex
1515
echo "# Installing basic system dependencies"
1616
yum install -y zlib-devel gcc-c++
1717

18-
# Build OpenSSL
19-
$(dirname $0)/build-openssl.sh /usr
20-
2118
echo "# Building librdkafka ${LIBRDKAFKA_VERSION}"
2219
$(dirname $0)/bootstrap-librdkafka.sh --require-ssl ${LIBRDKAFKA_VERSION} /usr
2320

0 commit comments

Comments
 (0)