Bumping ubuntu images to use boost 1_74_0

This commit is contained in:
Rodrigo Q. Saramago 2023-01-11 13:51:32 +01:00
parent a68af64004
commit a01936d5fc
No known key found for this signature in database
GPG Key ID: 9B36B2525704A359
3 changed files with 9 additions and 9 deletions

View File

@ -22,7 +22,7 @@
# (c) 2016-2021 solidity contributors. # (c) 2016-2021 solidity contributors.
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
FROM gcr.io/oss-fuzz-base/base-clang:latest as base FROM gcr.io/oss-fuzz-base/base-clang:latest as base
LABEL version="21" LABEL version="22"
ARG DEBIAN_FRONTEND=noninteractive ARG DEBIAN_FRONTEND=noninteractive
@ -46,18 +46,18 @@ FROM base AS libraries
# Boost # Boost
RUN set -ex; \ RUN set -ex; \
cd /usr/src; \ cd /usr/src; \
wget -q 'https://boostorg.jfrog.io/artifactory/main/release/1.73.0/source/boost_1_73_0.tar.bz2' -O boost.tar.bz2; \ wget -q 'https://boostorg.jfrog.io/artifactory/main/release/1.74.0/source/boost_1_74_0.tar.bz2' -O boost.tar.bz2; \
test "$(sha256sum boost.tar.bz2)" = "4eb3b8d442b426dc35346235c8733b5ae35ba431690e38c6a8263dce9fcbb402 boost.tar.bz2"; \ test "$(sha256sum boost.tar.bz2)" = "83bfc1507731a0906e387fc28b7ef5417d591429e51e788417fe9ff025e116b1 boost.tar.bz2" && \
tar -xf boost.tar.bz2; \ tar -xf boost.tar.bz2; \
rm boost.tar.bz2; \ rm boost.tar.bz2; \
cd boost_1_73_0; \ cd boost_1_74_0; \
CXXFLAGS="-stdlib=libc++ -pthread" LDFLAGS="-stdlib=libc++" ./bootstrap.sh --with-toolset=clang --prefix=/usr; \ CXXFLAGS="-stdlib=libc++ -pthread" LDFLAGS="-stdlib=libc++" ./bootstrap.sh --with-toolset=clang --prefix=/usr; \
./b2 toolset=clang cxxflags="-stdlib=libc++ -pthread" linkflags="-stdlib=libc++ -pthread" headers; \ ./b2 toolset=clang cxxflags="-stdlib=libc++ -pthread" linkflags="-stdlib=libc++ -pthread" headers; \
./b2 toolset=clang cxxflags="-stdlib=libc++ -pthread" linkflags="-stdlib=libc++ -pthread" \ ./b2 toolset=clang cxxflags="-stdlib=libc++ -pthread" linkflags="-stdlib=libc++ -pthread" \
link=static variant=release runtime-link=static \ link=static variant=release runtime-link=static \
system filesystem unit_test_framework program_options \ system filesystem unit_test_framework program_options \
install -j $(($(nproc)/2)); \ install -j $(($(nproc)/2)); \
rm -rf /usr/src/boost_1_73_0 rm -rf /usr/src/boost_1_74_0
# Z3 # Z3
RUN set -ex; \ RUN set -ex; \

View File

@ -21,8 +21,8 @@
# #
# (c) 2016-2019 solidity contributors. # (c) 2016-2019 solidity contributors.
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
FROM buildpack-deps:focal AS base FROM buildpack-deps:jammy AS base
LABEL version="16" LABEL version="17"
ARG DEBIAN_FRONTEND=noninteractive ARG DEBIAN_FRONTEND=noninteractive

View File

@ -21,8 +21,8 @@
# #
# (c) 2016-2019 solidity contributors. # (c) 2016-2019 solidity contributors.
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
FROM buildpack-deps:focal AS base FROM buildpack-deps:jammy AS base
LABEL version="16" LABEL version="17"
ARG DEBIAN_FRONTEND=noninteractive ARG DEBIAN_FRONTEND=noninteractive