From be3285d0bc8fbfcb5b741b51fe4622eb0d2b584f Mon Sep 17 00:00:00 2001 From: JianyiCheng Date: Mon, 3 Jul 2023 15:20:36 +0100 Subject: [PATCH] Added cheri build dependencies --- Docker/Dockerfile | 12 +++++++++++- Makefile | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/Docker/Dockerfile b/Docker/Dockerfile index ec55c2f..784fd48 100644 --- a/Docker/Dockerfile +++ b/Docker/Dockerfile @@ -16,7 +16,17 @@ RUN apt-get update -y \ && apt-get install -y verilator gcc-riscv64-unknown-elf \ libgmp-dev python3 python3-pip g++\ clang llvm lld clang-tidy clang-format \ - gcc-multilib gcc cmake + gcc-multilib gcc cmake sudo wget vim \ + curl + +# Install CHERI dependencies +RUN apt-get update -y \ + && apt-get install -y autoconf automake libtool pkg-config \ + clang bison cmake mercurial ninja-build \ + samba flex texinfo time libglib2.0-dev \ + libpixman-1-dev libarchive-dev libarchive-tools \ + libbz2-dev libattr1-dev libcap-ng-dev \ + libexpat1-dev libgmp-dev # Install SystemVerilog formatter RUN mkdir -p /srcPkgs \ diff --git a/Makefile b/Makefile index d33eab1..6daac0b 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ build-docker: # Enter the docker image shell: build-docker - docker run -it --shm-size 256m --hostname simtight-ubuntu2204 -u $(user) -v $(shell pwd):/workspace simtightubuntu2204:latest /bin/bash + docker run -it --shm-size 256m --hostname simtight-ubuntu2204 -u $(user) -v $(shell pwd):/workspace simtight-ubuntu2204:latest /bin/bash # Fetch submodules sync: