From 1c2615776a7b3fa2693d8405d72870ebd1817726 Mon Sep 17 00:00:00 2001 From: Readon Date: Sat, 15 Jun 2024 15:01:41 +0800 Subject: [PATCH] Revert "Add GHDL as plugin to Yosys" --- Dockerfile | 25 ++----------------------- 1 file changed, 2 insertions(+), 23 deletions(-) diff --git a/Dockerfile b/Dockerfile index 656df30..bae035d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,6 @@ # SPDX-License-Identifier: GPL-3.0-only # # Author(s): Pavel Benacek -# Leuenberger Niklaus ARG UBUNTU_VERSION=22.04 FROM ubuntu:$UBUNTU_VERSION AS base @@ -14,14 +13,14 @@ ARG SBT_OPTS_DEFAULT="-Dsbt.override.build.repos=true -Dsbt.boot.directory=/sbt/ ENV COURSIER_CACHE=$COURSIER_CACHE_DEFAULT ENV SBT_OPTS=$SBT_OPTS_DEFAULT -ARG DEPS_RUNTIME="ca-certificates gnupg2 openjdk-17-jdk-headless ccache curl g++ gcc git libtcl8.6 python3 python3-pip python3-pip-whl libpython3-dev ssh locales make libgnat-13 iverilog libboost1.74-dev" +ARG DEPS_RUNTIME="ca-certificates gnupg2 openjdk-17-jdk-headless ccache curl g++ gcc git libtcl8.6 python3 python3-pip python3-pip-whl libpython3-dev ssh locales make ghdl iverilog libboost1.74-dev" RUN apt-get update && \ apt-get install -y --no-install-recommends $DEPS_RUNTIME FROM base AS build-symbiyosys ENV PREFIX=/opt -ARG DEPS_YOSYS="autoconf build-essential clang cmake libffi-dev libreadline-dev pkg-config tcl-dev unzip flex bison gnat libz-dev" +ARG DEPS_YOSYS="autoconf build-essential clang cmake libffi-dev libreadline-dev pkg-config tcl-dev unzip flex bison" RUN apt-get install -y --no-install-recommends $DEPS_YOSYS ARG YOSYS_VERSION="yosys-0.28" @@ -66,26 +65,6 @@ RUN git clone https://github.com/YosysHQ/sby.git SymbiYosys && \ cd .. && \ rm -Rf SymbiYosys -ARG GHDL_VERSION="v4.1.0" -RUN git clone https://github.com/ghdl/ghdl ghdl && \ - cd ghdl && \ - git checkout $GHDL_VERSION && \ - mkdir build && \ - cd build && \ - ../configure --prefix=$PREFIX && \ - make && \ - make install && \ - cd ../.. && \ - rm -Rf ghdl - -ARG GHDL_PLUGIN_VERSION="0c4740a" -RUN git clone https://github.com/ghdl/ghdl-yosys-plugin.git ghdl-yosys-plugin && \ - cd ghdl-yosys-plugin && \ - git reset $GHDL_PLUGIN_VERSION --hard && \ - make YOSYS_PREFIX=$PREFIX install && \ - cd .. && \ - rm -Rf ghdl-yosys-plugin - FROM base AS build-verilator ENV PREFIX=/opt