From c3567cb19975c97561b756ed51db0e5e7d917926 Mon Sep 17 00:00:00 2001 From: Dave Keeshan <96727608+davekeeshan@users.noreply.github.com> Date: Mon, 10 Jun 2024 23:14:26 +0100 Subject: [PATCH] verilator: Some environment varibles are no longer required (#44655) * verilator: Some environment varibles are no longer required * Revert depends_on for flex back to the deafult case * Use decorator, when, for setup_run_environment insdtead of if inside function --- var/spack/repos/builtin/packages/verilator/package.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/var/spack/repos/builtin/packages/verilator/package.py b/var/spack/repos/builtin/packages/verilator/package.py index 75a2e6cd3d4..db00e7ddfc4 100644 --- a/var/spack/repos/builtin/packages/verilator/package.py +++ b/var/spack/repos/builtin/packages/verilator/package.py @@ -76,15 +76,17 @@ class Verilator(AutotoolsPackage): depends_on("help2man", type="build") depends_on("bison", type="build") depends_on("flex") - depends_on("ccache", type=("build", "run"), when="@5.018:") depends_on("perl", type=("build", "run")) + depends_on("ccache", type=("build", "run"), when="@5.018:") conflicts("%gcc@:6", msg="C++14 support required") # we need to fix the CXX and LINK paths, as they point to the spack # wrapper scripts which aren't usable without spack filter_compiler_wrappers("verilated.mk", relative_root="include") + filter_compiler_wrappers("verilated.mk", relative_root="share/verilator/include") + @when("@:5.022") def setup_run_environment(self, env): env.prepend_path("VERILATOR_ROOT", self.prefix)