cerc-io/solidity
15
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove antlr and add libabicoder to ossfuzz docker image.

Browse Source
This commit is contained in:
Daniel Kirchner 2020-10-15 13:15:41 +02:00
parent 2bfa3487cb
commit a34e5bf111
1 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
scripts/docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz
View File

@ -22,7 +22,7 @@
# (c) 2016-2019 solidity contributors. # (c) 2016-2019 solidity contributors.
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
FROM gcr.io/oss-fuzz-base/base-clang as base FROM gcr.io/oss-fuzz-base/base-clang as base
LABEL version="4" LABEL version="5"
ARG DEBIAN_FRONTEND=noninteractive ARG DEBIAN_FRONTEND=noninteractive
@ -32,7 +32,7 @@ RUN apt-get update; \
software-properties-common \ software-properties-common \
ninja-build git wget \ ninja-build git wget \
libbz2-dev zlib1g-dev git curl uuid-dev \ libbz2-dev zlib1g-dev git curl uuid-dev \
pkg-config openjdk-8-jdk liblzma-dev unzip; \ pkg-config openjdk-8-jdk liblzma-dev unzip mlton; \
apt-get install -qy python-pip python-sphinx; apt-get install -qy python-pip python-sphinx;
# Install cmake 3.14 (minimum requirement is cmake 3.10) # Install cmake 3.14 (minimum requirement is cmake 3.10)
@ -109,23 +109,16 @@ RUN set -ex; \
ninja install/strip; \ ninja install/strip; \
rm -rf /usr/src/hera rm -rf /usr/src/hera
# ANTLR4 RUNTIME # libabicoder
RUN set -ex; \ RUN set -ex; \
cd /usr/src; \ cd /usr/src; \
wget https://www.antlr.org/download/antlr4-cpp-runtime-4.8-source.zip; \ git clone https://github.com/ekpyron/Yul-Isabelle; \
rm -rf antlr4-runtime && mkdir antlr4-runtime; \ cd Yul-Isabelle; \
unzip antlr4-cpp-runtime-4.8-source.zip -d antlr4-runtime; \ cd libabicoder; \
cd antlr4-runtime && mkdir build && cd build; \ CXX=clang++ CXXFLAGS="-stdlib=libc++" make; \
cmake .. -DWITH_LIBCXX=On -DCMAKE_BUILD_TYPE=Release -DWITH_DEMO=False; \ cp libabicoder.a /usr/lib; \
make -j; \ cp abicoder.hpp /usr/include; \
DESTDIR=run make install; \ rm -rf /usr/src/Yul-Isabelle
# Manually copy needed library and includes since install script
# does not respect -DCMAKE_INSTALL_DIR and there is no option
# to disable shared library build/installation
cp -Rf run/usr/local/include/antlr4-runtime /usr/include; \
cp -f run/usr/local/lib/libantlr4-runtime.a /usr/lib; \
rm -rf /usr/src/antlr4-cpp-runtime-4.8-source.zip; \
rm -rf /usr/src/antlr4-runtime
FROM base FROM base
COPY --from=libraries /usr/lib /usr/lib COPY --from=libraries /usr/lib /usr/lib