Compare commits

...

1 Commits

Author SHA1 Message Date
  T. Meissner e90e7f9f77 Update to Debian Bullseye 2 years ago
2 changed files with 12 additions and 10 deletions
Unified View
  1. +7
    -5
      ghdl-formal.Dockerfile
  2. +5
    -5
      symbiyosys.Dockerfile

+ 7
- 5
ghdl-formal.Dockerfile View File

@ -2,7 +2,7 @@
FROM symbiyosys as symbiyosys-ghdl FROM symbiyosys as symbiyosys-ghdl
ARG LLVM_VER="7"
ARG LLVM_VER="11"
RUN apt-get update -qq && \ RUN apt-get update -qq && \
DEBIAN_FRONTEND=noninteractive apt-get -y install --no-install-recommends \ DEBIAN_FRONTEND=noninteractive apt-get -y install --no-install-recommends \
@ -36,16 +36,18 @@ RUN cd /root && \
# GHDL-formal # GHDL-formal
FROM debian:buster-slim AS ghdl-formal
FROM debian:bullseye-slim AS ghdl-formal
ARG LLVM_VER="11"
# Get runtime dependencies # Get runtime dependencies
RUN apt-get update -qq && \ RUN apt-get update -qq && \
DEBIAN_FRONTEND=noninteractive apt-get -y install --no-install-recommends \ DEBIAN_FRONTEND=noninteractive apt-get -y install --no-install-recommends \
ca-certificates \ ca-certificates \
libreadline7 \
libreadline8 \
libtcl8.6 \ libtcl8.6 \
libgnat-8 \
libllvm7 \
libgnat-10 \
libllvm$LLVM_VER \
gcc \ gcc \
libc6-dev \ libc6-dev \
zlib1g-dev \ zlib1g-dev \


+ 5
- 5
symbiyosys.Dockerfile View File

@ -1,4 +1,4 @@
FROM debian:buster-slim as yosys
FROM debian:bullseye-slim as yosys
## YOSYS ## ## YOSYS ##
@ -17,7 +17,6 @@ RUN apt-get update -qq && \
graphviz \ graphviz \
xdot \ xdot \
pkg-config \ pkg-config \
python3 \
libboost-system-dev \ libboost-system-dev \
libboost-python-dev \ libboost-python-dev \
libboost-filesystem-dev \ libboost-filesystem-dev \
@ -51,8 +50,9 @@ RUN apt-get update -qq && \
ninja-build \ ninja-build \
g++ \ g++ \
python-setuptools \ python-setuptools \
python-pip \
python-wheel \
python3-pip \
python-wheel-common \
python-dev-is-python2 \
mercurial && \ mercurial && \
apt-get autoclean && apt-get clean && apt-get -y autoremove && \ apt-get autoclean && apt-get clean && apt-get -y autoremove && \
rm -rf /var/lib/apt/lists/* && \ rm -rf /var/lib/apt/lists/* && \
@ -65,7 +65,7 @@ RUN apt-get update -qq && \
cd .. && \ cd .. && \
git clone https://github.com/Z3Prover/z3.git z3 && \ git clone https://github.com/Z3Prover/z3.git z3 && \
cd z3 && \ cd z3 && \
python scripts/mk_make.py && \
python3 scripts/mk_make.py && \
cd build && \ cd build && \
make -j$(nproc) PREFIX=/opt/z3 && \ make -j$(nproc) PREFIX=/opt/z3 && \
make install PREFIX=/opt/z3 && \ make install PREFIX=/opt/z3 && \


Loading…
Cancel
Save