Skip to content

Commit 6e1ad17

Browse files
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
1 parent 9f96eb9 commit 6e1ad17

File tree

5 files changed

+16
-11
lines changed

5 files changed

+16
-11
lines changed

dependencies.yaml

+8-7
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,12 @@
1717
# under the License.
1818
#
1919

20-
boost : 1.83.0
21-
cmake: 3.24.2
20+
# Note: GCC 4.8 is incompatible with Boost >= 1.84 for the missed std::align
21+
boost: 1.83.0
22+
cmake: 3.28.3
2223
protobuf: 3.20.0
23-
zlib: 1.2.12
24-
zstd: 1.5.2
25-
snappy: 1.1.9
26-
openssl: 1.1.1v
27-
curl: 8.4.0
24+
zlib: 1.3.1
25+
zstd: 1.5.5
26+
snappy: 1.1.10
27+
openssl: 1.1.1w
28+
curl: 8.6.0

pkg/apk/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ RUN CURL_VERSION=$(dep-version.py curl) && \
104104
curl -O -L https://github.com/curl/curl/releases/download/curl-${CURL_VERSION_UNDERSCORE}/curl-${CURL_VERSION}.tar.gz && \
105105
tar xfz curl-${CURL_VERSION}.tar.gz && \
106106
cd curl-${CURL_VERSION} && \
107-
CFLAGS=-fPIC ./configure --with-ssl=/usr/local/ssl/ --without-zstd && \
107+
CFLAGS=-fPIC ./configure --with-ssl=/usr/local/ssl/ --without-zstd --without-libpsl && \
108108
make -j8 && make install && \
109109
rm -rf /curl-${CURL_VERSION}.tar.gz /curl-${CURL_VERSION}
110110

pkg/deb/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ RUN CURL_VERSION=$(dep-version.py curl) && \
109109
curl -O -L https://github.com/curl/curl/releases/download/curl-${CURL_VERSION_UNDERSCORE}/curl-${CURL_VERSION}.tar.gz && \
110110
tar xfz curl-${CURL_VERSION}.tar.gz && \
111111
cd curl-${CURL_VERSION} && \
112-
CFLAGS=-fPIC ./configure --with-ssl=/usr/local/ssl/ --without-zstd && \
112+
CFLAGS=-fPIC ./configure --with-ssl=/usr/local/ssl/ --without-zstd --without-libpsl && \
113113
make -j8 && make install && \
114114
rm -rf /curl-${CURL_VERSION}.tar.gz /curl-${CURL_VERSION}
115115

pkg/mac/build-static-library.sh

+4
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,9 @@ if [ ! -f snappy-${SNAPPY_VERSION}/.done ]; then
140140
curl -O -L https://github.com/google/snappy/archive/refs/tags/${SNAPPY_VERSION}.tar.gz
141141
tar zxf ${SNAPPY_VERSION}.tar.gz
142142
pushd snappy-${SNAPPY_VERSION}
143+
# Without this patch, snappy 1.10 will report a sign-compare error, which cannot be suppressed with the -Wno-sign-compare option in CI
144+
curl -O -L https://raw.githubusercontent.com/microsoft/vcpkg/2024.02.14/ports/snappy/no-werror.patch
145+
patch <no-werror.patch
143146
CXXFLAGS="-fPIC -O3 -arch ${ARCH} -mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET}" \
144147
cmake . -DCMAKE_INSTALL_PREFIX=$PREFIX -DSNAPPY_BUILD_TESTS=OFF -DSNAPPY_BUILD_BENCHMARKS=OFF
145148
make -j16
@@ -167,6 +170,7 @@ if [ ! -f curl-${CURL_VERSION}/.done ]; then
167170
--without-secure-transport \
168171
--without-librtmp \
169172
--disable-ipv6 \
173+
--without-libpsl \
170174
--host=$ARCH-apple-darwin \
171175
--prefix=$PREFIX
172176
make -j16 install

pkg/rpm/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ RUN BOOST_VERSION=$(dep-version.py boost) && \
4646
tar zxf boost-${BOOST_VERSION}.tar.gz && \
4747
cd boost-${BOOST_VERSION} && \
4848
./bootstrap.sh --with-libraries=regex && \
49-
./b2 address-model=64 cxxflags=-fPIC link=static threading=multi variant=release install && \
49+
./b2 address-model=64 cxxflags="-fPIC -std=c++11" link=static threading=multi variant=release install && \
5050
rm -rf /boost-${BOOST_VERSION}.tar.gz /boost-${BOOST_VERSION}
5151

5252
RUN CMAKE_VERSION=$(dep-version.py cmake) && \
@@ -110,7 +110,7 @@ RUN CURL_VERSION=$(dep-version.py curl) && \
110110
curl -O -L https://github.com/curl/curl/releases/download/curl-${CURL_VERSION_UNDERSCORE}/curl-${CURL_VERSION}.tar.gz && \
111111
tar xfz curl-${CURL_VERSION}.tar.gz && \
112112
cd curl-${CURL_VERSION} && \
113-
CFLAGS=-fPIC ./configure --with-ssl=/usr/local/ssl/ --without-zstd && \
113+
CFLAGS=-fPIC ./configure --with-ssl=/usr/local/ssl/ --without-zstd --without-libpsl && \
114114
make -j8 && make install && \
115115
rm -rf /curl-${CURL_VERSION}.tar.gz /curl-${CURL_VERSION}
116116

0 commit comments

Comments
 (0)