This is an automated email from the ASF dual-hosted git repository.
mmerli pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/pulsar-client-cpp.git
The following commit(s) were added to refs/heads/main by this push:
new 6e1ad17 Update dependencies to latest versions (#404)
6e1ad17 is described below
commit 6e1ad1742ac98149c56faa32dc39d421dfe8ebd8
Author: Yunze Xu <[email protected]>
AuthorDate: Fri Mar 1 01:34:21 2024 +0800
Update dependencies to latest versions (#404)
* Update dependencies to latest versions
Restore protobuf version
* Fix build script
* Fix Linux build Dockerfiles
* Downgrade Boost to 1.83
---
dependencies.yaml | 15 ++++++++-------
pkg/apk/Dockerfile | 2 +-
pkg/deb/Dockerfile | 2 +-
pkg/mac/build-static-library.sh | 4 ++++
pkg/rpm/Dockerfile | 4 ++--
5 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/dependencies.yaml b/dependencies.yaml
index a02ebdc..8d338e4 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -17,11 +17,12 @@
# under the License.
#
-boost : 1.83.0
-cmake: 3.24.2
+# Note: GCC 4.8 is incompatible with Boost >= 1.84 for the missed std::align
+boost: 1.83.0
+cmake: 3.28.3
protobuf: 3.20.0
-zlib: 1.2.12
-zstd: 1.5.2
-snappy: 1.1.9
-openssl: 1.1.1v
-curl: 8.4.0
+zlib: 1.3.1
+zstd: 1.5.5
+snappy: 1.1.10
+openssl: 1.1.1w
+curl: 8.6.0
diff --git a/pkg/apk/Dockerfile b/pkg/apk/Dockerfile
index 3cfe658..d7d8718 100644
--- a/pkg/apk/Dockerfile
+++ b/pkg/apk/Dockerfile
@@ -104,7 +104,7 @@ RUN CURL_VERSION=$(dep-version.py curl) && \
curl -O -L
https://github.com/curl/curl/releases/download/curl-${CURL_VERSION_UNDERSCORE}/curl-${CURL_VERSION}.tar.gz
&& \
tar xfz curl-${CURL_VERSION}.tar.gz && \
cd curl-${CURL_VERSION} && \
- CFLAGS=-fPIC ./configure --with-ssl=/usr/local/ssl/ --without-zstd && \
+ CFLAGS=-fPIC ./configure --with-ssl=/usr/local/ssl/ --without-zstd
--without-libpsl && \
make -j8 && make install && \
rm -rf /curl-${CURL_VERSION}.tar.gz /curl-${CURL_VERSION}
diff --git a/pkg/deb/Dockerfile b/pkg/deb/Dockerfile
index 7873cdf..502b093 100644
--- a/pkg/deb/Dockerfile
+++ b/pkg/deb/Dockerfile
@@ -109,7 +109,7 @@ RUN CURL_VERSION=$(dep-version.py curl) && \
curl -O -L
https://github.com/curl/curl/releases/download/curl-${CURL_VERSION_UNDERSCORE}/curl-${CURL_VERSION}.tar.gz
&& \
tar xfz curl-${CURL_VERSION}.tar.gz && \
cd curl-${CURL_VERSION} && \
- CFLAGS=-fPIC ./configure --with-ssl=/usr/local/ssl/ --without-zstd && \
+ CFLAGS=-fPIC ./configure --with-ssl=/usr/local/ssl/ --without-zstd
--without-libpsl && \
make -j8 && make install && \
rm -rf /curl-${CURL_VERSION}.tar.gz /curl-${CURL_VERSION}
diff --git a/pkg/mac/build-static-library.sh b/pkg/mac/build-static-library.sh
index d49e199..4b97ac7 100755
--- a/pkg/mac/build-static-library.sh
+++ b/pkg/mac/build-static-library.sh
@@ -140,6 +140,9 @@ if [ ! -f snappy-${SNAPPY_VERSION}/.done ]; then
curl -O -L
https://github.com/google/snappy/archive/refs/tags/${SNAPPY_VERSION}.tar.gz
tar zxf ${SNAPPY_VERSION}.tar.gz
pushd snappy-${SNAPPY_VERSION}
+ # Without this patch, snappy 1.10 will report a sign-compare error,
which cannot be suppressed with the -Wno-sign-compare option in CI
+ curl -O -L
https://raw.githubusercontent.com/microsoft/vcpkg/2024.02.14/ports/snappy/no-werror.patch
+ patch <no-werror.patch
CXXFLAGS="-fPIC -O3 -arch ${ARCH}
-mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET}" \
cmake . -DCMAKE_INSTALL_PREFIX=$PREFIX -DSNAPPY_BUILD_TESTS=OFF
-DSNAPPY_BUILD_BENCHMARKS=OFF
make -j16
@@ -167,6 +170,7 @@ if [ ! -f curl-${CURL_VERSION}/.done ]; then
--without-secure-transport \
--without-librtmp \
--disable-ipv6 \
+ --without-libpsl \
--host=$ARCH-apple-darwin \
--prefix=$PREFIX
make -j16 install
diff --git a/pkg/rpm/Dockerfile b/pkg/rpm/Dockerfile
index b82840f..40044a5 100644
--- a/pkg/rpm/Dockerfile
+++ b/pkg/rpm/Dockerfile
@@ -46,7 +46,7 @@ RUN BOOST_VERSION=$(dep-version.py boost) && \
tar zxf boost-${BOOST_VERSION}.tar.gz && \
cd boost-${BOOST_VERSION} && \
./bootstrap.sh --with-libraries=regex && \
- ./b2 address-model=64 cxxflags=-fPIC link=static threading=multi
variant=release install && \
+ ./b2 address-model=64 cxxflags="-fPIC -std=c++11" link=static
threading=multi variant=release install && \
rm -rf /boost-${BOOST_VERSION}.tar.gz /boost-${BOOST_VERSION}
RUN CMAKE_VERSION=$(dep-version.py cmake) && \
@@ -110,7 +110,7 @@ RUN CURL_VERSION=$(dep-version.py curl) && \
curl -O -L
https://github.com/curl/curl/releases/download/curl-${CURL_VERSION_UNDERSCORE}/curl-${CURL_VERSION}.tar.gz
&& \
tar xfz curl-${CURL_VERSION}.tar.gz && \
cd curl-${CURL_VERSION} && \
- CFLAGS=-fPIC ./configure --with-ssl=/usr/local/ssl/ --without-zstd && \
+ CFLAGS=-fPIC ./configure --with-ssl=/usr/local/ssl/ --without-zstd
--without-libpsl && \
make -j8 && make install && \
rm -rf /curl-${CURL_VERSION}.tar.gz /curl-${CURL_VERSION}
