From a2d90f49a3f75c09414f4ba3ee115f9af717ae1d Mon Sep 17 00:00:00 2001 From: Thomas Weatherly Date: Thu, 27 Aug 2026 19:06:53 -0400 Subject: [PATCH] build: apptainer image needs libpng/boost-serialization; xrt synth resolves verilator from TOOLDIR MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit miscs/apptainer/vortex.def omitted libpng-dev and libboost-serialization-dev, which third_party/cocogfx (png.cpp, cgltrace.cpp) requires, so 'make software' fails inside a freshly built image; ci/install_dependencies.sh already installs both. hw/syn/xilinx/xrt/Makefile never included hw/syn/common.mk, so gen_sources.sh fell back to a bare 'verilator' on PATH and failed unless a toolchain env was sourced by hand — the retired toolchain_env.sh used to provide it. Co-Authored-By: Claude Fable 5 --- hw/syn/xilinx/xrt/Makefile | 2 ++ miscs/apptainer/vortex.def | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/hw/syn/xilinx/xrt/Makefile b/hw/syn/xilinx/xrt/Makefile index f28d3b3c0a..f78dc24f7d 100644 --- a/hw/syn/xilinx/xrt/Makefile +++ b/hw/syn/xilinx/xrt/Makefile @@ -1,5 +1,7 @@ ROOT_DIR := $(realpath ../../../..) include $(ROOT_DIR)/config.mk +# tool binaries (VERILATOR for gen_sources.sh) resolved from TOOLDIR, no sourced env needed +include $(VORTEX_HOME)/hw/syn/common.mk ifneq ($(findstring Makefile, $(MAKEFILE_LIST)), Makefile) help: diff --git a/miscs/apptainer/vortex.def b/miscs/apptainer/vortex.def index bdefb7d205..d53debf7f4 100644 --- a/miscs/apptainer/vortex.def +++ b/miscs/apptainer/vortex.def @@ -44,7 +44,7 @@ From: ubuntu:22.04 openjdk-11-jre-headless libcairo2 librsvg2-2 librsvg2-common \ openjdk-11-jre-zero libtheora0 libavcodec58 libcairo-gobject2 \ ca-certificates-java libchromaprint1 software-properties-common perl-modules bzip2 \ - unzip zlib1g-dev libtinfo5 g++ usbutils pciutils gawk bison gcc make tar python3.9 python3-pip python3-pytest python3-yaml locales zstd uuid-dev ccache \ + unzip zlib1g-dev libtinfo5 g++ usbutils pciutils gawk bison gcc make tar python3.9 python3-pip python3-pytest python3-yaml locales zstd uuid-dev ccache libpng-dev libboost-serialization-dev \ libboost-filesystem1.74.0 libboost-program-options1.74.0 libboost-system1.74.0 libboost-chrono1.74.0 libboost-thread1.74.0 \ environment-modules openmpi-bin libopenmpi-dev || true