You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by zi...@apache.org on 2022/10/21 01:33:22 UTC
[pulsar] branch branch-2.11 updated: [branch-2.11][cpp] Fix zlib dowload path. (#18137)
This is an automated email from the ASF dual-hosted git repository.
zike pushed a commit to branch branch-2.11
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/branch-2.11 by this push:
new fc7b4a486f1 [branch-2.11][cpp] Fix zlib dowload path. (#18137)
fc7b4a486f1 is described below
commit fc7b4a486f11674fd90780d1fd50196cf46bd4ee
Author: Baodi Shi <ba...@icloud.com>
AuthorDate: Fri Oct 21 09:33:13 2022 +0800
[branch-2.11][cpp] Fix zlib dowload path. (#18137)
---
pulsar-client-cpp/docker/alpine/Dockerfile | 8 ++++----
pulsar-client-cpp/docker/alpine/Dockerfile-alpine-3.8 | 8 ++++----
pulsar-client-cpp/docker/manylinux1/Dockerfile | 8 ++++----
pulsar-client-cpp/docker/manylinux2014/Dockerfile | 8 ++++----
pulsar-client-cpp/docker/manylinux_musl/Dockerfile | 8 ++++----
pulsar-client-cpp/python/build-mac-wheels.sh | 4 ++--
6 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/pulsar-client-cpp/docker/alpine/Dockerfile b/pulsar-client-cpp/docker/alpine/Dockerfile
index e6bae71bfe2..cabb8f4092f 100644
--- a/pulsar-client-cpp/docker/alpine/Dockerfile
+++ b/pulsar-client-cpp/docker/alpine/Dockerfile
@@ -43,12 +43,12 @@ RUN curl -O -L https://boostorg.jfrog.io/artifactory/main/release/1.72.0/source/
rm -rf /boost_1_72_0.tar.gz /boost_1_72_0
# ZLib
-RUN curl -O -L https://zlib.net/zlib-1.2.12.tar.gz && \
- tar xfz zlib-1.2.12.tar.gz && \
- cd zlib-1.2.12 && \
+RUN curl -O -L https://zlib.net/fossils/zlib-1.2.13.tar.gz && \
+ tar xfz zlib-1.2.13.tar.gz && \
+ cd zlib-1.2.13 && \
CFLAGS="-fPIC -O3" ./configure && \
make -j4 && make install && \
- rm -rf /zlib-1.2.12.tar.gz /zlib-1.2.12
+ rm -rf /zlib-1.2.13.tar.gz /zlib-1.2.13
# Compile OpenSSL
RUN curl -O -L https://github.com/openssl/openssl/archive/OpenSSL_1_1_0j.tar.gz && \
diff --git a/pulsar-client-cpp/docker/alpine/Dockerfile-alpine-3.8 b/pulsar-client-cpp/docker/alpine/Dockerfile-alpine-3.8
index 713e512e9f4..f57d434c1be 100644
--- a/pulsar-client-cpp/docker/alpine/Dockerfile-alpine-3.8
+++ b/pulsar-client-cpp/docker/alpine/Dockerfile-alpine-3.8
@@ -43,12 +43,12 @@ RUN curl -O -L https://boostorg.jfrog.io/artifactory/main/release/1.72.0/source/
rm -rf /boost_1_72_0.tar.gz /boost_1_72_0
# ZLib
-RUN curl -O -L https://zlib.net/zlib-1.2.12.tar.gz && \
- tar xfz zlib-1.2.12.tar.gz && \
- cd zlib-1.2.12 && \
+RUN curl -O -L https://zlib.net/fossils/zlib-1.2.13.tar.gz && \
+ tar xfz zlib-1.2.13.tar.gz && \
+ cd zlib-1.2.13 && \
CFLAGS="-fPIC -O3" ./configure && \
make -j4 && make install && \
- rm -rf /zlib-1.2.12.tar.gz /zlib-1.2.12
+ rm -rf /zlib-1.2.13.tar.gz /zlib-1.2.13
# Compile OpenSSL
RUN curl -O -L https://github.com/openssl/openssl/archive/OpenSSL_1_1_0j.tar.gz && \
diff --git a/pulsar-client-cpp/docker/manylinux1/Dockerfile b/pulsar-client-cpp/docker/manylinux1/Dockerfile
index feb72efc136..68f2d315200 100644
--- a/pulsar-client-cpp/docker/manylinux1/Dockerfile
+++ b/pulsar-client-cpp/docker/manylinux1/Dockerfile
@@ -47,12 +47,12 @@ RUN curl -O -L https://www.cpan.org/src/5.0/perl-5.10.0.tar.gz && \
####################################
# ZLib
-RUN curl -O -L https://zlib.net/zlib-1.2.12.tar.gz && \
- tar xvfz zlib-1.2.12.tar.gz && \
- cd zlib-1.2.12 && \
+RUN curl -O -L https://zlib.net/fossils/zlib-1.2.13.tar.gz && \
+ tar xvfz zlib-1.2.13.tar.gz && \
+ cd zlib-1.2.13 && \
CFLAGS="-fPIC -O3" ./configure && \
make && make install && \
- rm -rf /zlib-1.2.12.tar.gz /zlib-1.2.12
+ rm -rf /zlib-1.2.13.tar.gz /zlib-1.2.13
# Compile OpenSSL
RUN curl -O -L https://github.com/openssl/openssl/archive/OpenSSL_1_1_0j.tar.gz && \
diff --git a/pulsar-client-cpp/docker/manylinux2014/Dockerfile b/pulsar-client-cpp/docker/manylinux2014/Dockerfile
index ce4e192c79b..4f858c5c825 100644
--- a/pulsar-client-cpp/docker/manylinux2014/Dockerfile
+++ b/pulsar-client-cpp/docker/manylinux2014/Dockerfile
@@ -48,12 +48,12 @@ RUN curl -O -L https://www.cpan.org/src/5.0/perl-5.10.0.tar.gz && \
####################################
# ZLib
-RUN curl -O -L https://zlib.net/zlib-1.2.12.tar.gz && \
- tar xvfz zlib-1.2.12.tar.gz && \
- cd zlib-1.2.12 && \
+RUN curl -O -L https://zlib.net/fossils/zlib-1.2.13.tar.gz && \
+ tar xvfz zlib-1.2.13.tar.gz && \
+ cd zlib-1.2.13 && \
CFLAGS="-fPIC -O3" ./configure && \
make -j8 && make install && \
- rm -rf /zlib-1.2.12.tar.gz /zlib-1.2.12
+ rm -rf /zlib-1.2.13.tar.gz /zlib-1.2.13
# Compile OpenSSL
RUN curl -O -L https://github.com/openssl/openssl/archive/OpenSSL_1_1_1n.tar.gz && \
diff --git a/pulsar-client-cpp/docker/manylinux_musl/Dockerfile b/pulsar-client-cpp/docker/manylinux_musl/Dockerfile
index 2c9ec058976..337e8c0b29d 100644
--- a/pulsar-client-cpp/docker/manylinux_musl/Dockerfile
+++ b/pulsar-client-cpp/docker/manylinux_musl/Dockerfile
@@ -48,12 +48,12 @@ RUN curl -O -L https://www.cpan.org/src/5.0/perl-5.10.0.tar.gz && \
####################################
# ZLib
-RUN curl -O -L https://zlib.net/zlib-1.2.12.tar.gz && \
- tar xvfz zlib-1.2.12.tar.gz && \
- cd zlib-1.2.12 && \
+RUN curl -O -L https://zlib.net/fossils/zlib-1.2.13.tar.gz && \
+ tar xvfz zlib-1.2.13.tar.gz && \
+ cd zlib-1.2.13 && \
CFLAGS="-fPIC -O3" ./configure && \
make -j8 && make install && \
- rm -rf /zlib-1.2.12.tar.gz /zlib-1.2.12
+ rm -rf /zlib-1.2.13.tar.gz /zlib-1.2.13
# Compile OpenSSL
RUN curl -O -L https://github.com/openssl/openssl/archive/OpenSSL_1_1_1n.tar.gz && \
diff --git a/pulsar-client-cpp/python/build-mac-wheels.sh b/pulsar-client-cpp/python/build-mac-wheels.sh
index 6a4dae7117e..8267023e0ba 100755
--- a/pulsar-client-cpp/python/build-mac-wheels.sh
+++ b/pulsar-client-cpp/python/build-mac-wheels.sh
@@ -30,7 +30,7 @@ PYTHON_VERSIONS=(
export MACOSX_DEPLOYMENT_TARGET=10.15
MACOSX_DEPLOYMENT_TARGET_MAJOR=${MACOSX_DEPLOYMENT_TARGET%%.*}
-ZLIB_VERSION=1.2.12
+ZLIB_VERSION=1.2.13
OPENSSL_VERSION=1_1_1n
BOOST_VERSION=1.78.0
PROTOBUF_VERSION=3.20.0
@@ -90,7 +90,7 @@ done
###############################################################################
if [ ! -f zlib-${ZLIB_VERSION}/.done ]; then
echo "Building ZLib"
- curl -O -L https://zlib.net/zlib-${ZLIB_VERSION}.tar.gz
+ curl -O -L https://zlib.net/fossils/zlib-${ZLIB_VERSION}.tar.gz
tar xvfz zlib-$ZLIB_VERSION.tar.gz
pushd zlib-$ZLIB_VERSION
CFLAGS="-fPIC -O3 -arch arm64 -arch x86_64 -mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET}" ./configure --prefix=$PREFIX