You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by pe...@apache.org on 2022/10/20 04:21:53 UTC
[pulsar] branch branch-2.9 updated: [fix][cpp][branch-2.9] Fix zlib dowload path. (#18127)
This is an automated email from the ASF dual-hosted git repository.
penghui pushed a commit to branch branch-2.9
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/branch-2.9 by this push:
new 92da0bb3a6d [fix][cpp][branch-2.9] Fix zlib dowload path. (#18127)
92da0bb3a6d is described below
commit 92da0bb3a6de7da6726eb5eb74c34c59d33cf21f
Author: Baodi Shi <ba...@icloud.com>
AuthorDate: Thu Oct 20 12:21:45 2022 +0800
[fix][cpp][branch-2.9] Fix zlib dowload path. (#18127)
---
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 12d1e2f9f97..d7c266646c8 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 862785e9015..6b19326b9dd 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 502c6f6fe77..57c7c06d7ee 100644
--- a/pulsar-client-cpp/docker/manylinux1/Dockerfile
+++ b/pulsar-client-cpp/docker/manylinux1/Dockerfile
@@ -46,12 +46,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 4d1cfeef92b..31cc9a45a60 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 && 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 89dd2d10755..40417bcd790 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 0236eb44f79..0a8823d1875 100755
--- a/pulsar-client-cpp/python/build-mac-wheels.sh
+++ b/pulsar-client-cpp/python/build-mac-wheels.sh
@@ -34,7 +34,7 @@ PYTHON_VERSIONS=(
export MACOSX_DEPLOYMENT_TARGET=11.0
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
@@ -85,7 +85,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