diff --git a/docker/Dockerfile b/docker/Dockerfile index 11a7546e..8a9a9d79 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -129,13 +129,14 @@ RUN apt-get install --no-install-recommends -y iverilog ### Magic ### #ARG MAGIC_COMMIT=db4fa65bfc096e63954b37b188ea27b90ab31839 #ARG MAGIC_COMMIT=8.3.274 -#ARG MAGIC_COMMIT=8.3.310 -ARG MAGIC_COMMIT=d099562e85e16654ef4573f1eb26c89d1b3d1ee2 +ARG MAGIC_COMMIT=8.3.311 WORKDIR /root #RUN git clone https://github.com/RTimothyEdwards/magic.git magic RUN git clone git://opencircuitdesign.com/magic magic WORKDIR /root/magic RUN git checkout ${MAGIC_COMMIT} +COPY mrg.patch /root/magic +RUN git apply mrg.patch RUN ./configure \ && make \ && make install