Skip to content

Commit

Permalink
Update dependencies to latest versions (apache#404)
Browse files Browse the repository at this point in the history
* Update dependencies to latest versions

Restore protobuf version

* Fix build script

* Fix Linux build Dockerfiles

* Downgrade Boost to 1.83
  • Loading branch information
BewareMyPower authored Feb 29, 2024
1 parent 9f96eb9 commit 6e1ad17
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 11 deletions.
15 changes: 8 additions & 7 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion pkg/apk/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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}

Expand Down
2 changes: 1 addition & 1 deletion pkg/deb/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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}

Expand Down
4 changes: 4 additions & 0 deletions pkg/mac/build-static-library.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions pkg/rpm/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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) && \
Expand Down Expand Up @@ -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}

0 comments on commit 6e1ad17

Please sign in to comment.