Browse Source

Install missing libllvm & gcc pkg in ghdl-formal image

T. Meissner 1 month ago
parent
commit
9bf42f217a
1 changed files with 4 additions and 8 deletions
  1. 4
    8
      ghdl-formal.Dockerfile

+ 4
- 8
ghdl-formal.Dockerfile View File

@@ -31,7 +31,7 @@ FROM symbiyosys-ghdl AS symbiyosys-ghdlsynth
31 31
 RUN cd /root && \
32 32
     mkdir ghdlsynth-beta && \
33 33
     cd ghdlsynth-beta && \
34
-    curl https://codeload.github.com/tmeissner/ghdlsynth-beta/tar.gz/tests | tar xzf - --strip-components=1 && \
34
+    curl https://codeload.github.com/tgingold/ghdlsynth-beta/tar.gz/master | tar xzf - --strip-components=1 && \
35 35
     make GHDL=/opt/ghdl/bin/ghdl YOSYS_CONFIG=/opt/yosys/bin/yosys-config && \
36 36
     make install GHDL=/opt/ghdl/bin/ghdl YOSYS_CONFIG=/opt/yosys/bin/yosys-config
37 37
 
@@ -47,6 +47,8 @@ RUN apt-get update -qq && \
47 47
     libreadline7 \
48 48
     libtcl8.6 \
49 49
     libgnat-8 \
50
+    libllvm7 \
51
+    gcc \
50 52
     make \
51 53
     python3 && \
52 54
     apt-get autoclean && apt-get clean && apt-get -y autoremove && \
@@ -54,13 +56,7 @@ RUN apt-get update -qq && \
54 56
     rm -rf /var/lib/apt/lists/*
55 57
 
56 58
 # copy build artifacts
57
-COPY --from=symbiyosys-ghdlsynth /opt/ghdl /opt/ghdl
58
-COPY --from=symbiyosys-ghdlsynth /opt/symbiyosys /opt/symbiyosys
59
-COPY --from=symbiyosys-ghdlsynth /opt/yosys /opt/yosys
60
-COPY --from=symbiyosys-ghdlsynth /opt/z3 /opt/z3
61
-COPY --from=symbiyosys-ghdlsynth /opt/yices2 /opt/yices2
62
-COPY --from=symbiyosys-ghdlsynth /opt/cvc4 /opt/cvc4
63
-COPY --from=symbiyosys-ghdlsynth /opt/boolector /opt/boolector
59
+COPY --from=symbiyosys-ghdlsynth /opt /opt
64 60
 
65 61
 # Enhance path variable
66 62
 ENV PATH "/opt/ghdl/bin:/opt/symbiyosys/bin:/opt/yosys/bin:/opt/z3/bin:/opt/yices2/bin:/opt/cvc4/bin:/opt/boolector/bin:$PATH"