zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

verilator: add 5.028, fix builds when using gcc on newer versions (#47168)

Browse Source
This commit is contained in:
Eric Müller 2024-11-01 05:26:55 +01:00 committed by GitHub
parent b38a29f4df
commit 35aa02771a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
var/spack/repos/builtin/packages/verilator/fix_compile_gch.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/src/Makefile_obj.in b/src/Makefile_obj.in
index 18947923a..d29baa840 100644
--- a/src/Makefile_obj.in
+++ b/src/Makefile_obj.in
@@ -363,7 +363,7 @@ $(TGT): $(PREDEP_H) $(OBJS)
.SECONDARY:
%.gch: %
- $(OBJCACHE) ${CXX} ${CXXFLAGS} ${CPPFLAGSWALL} ${CFG_CXXFLAGS_PCH} $< -o $@
+ $(OBJCACHE) ${CXX} ${CXXFLAGS} ${CPPFLAGSWALL} ${CFG_CXXFLAGS_PCH} -c $< -o $@
%.o: %.cpp
$(OBJCACHE) ${CXX} ${CXXFLAGS} ${CPPFLAGSWALL} -c $< -o $@
%.o: %.c

3
var/spack/repos/builtin/packages/verilator/package.py
View File

@ -42,6 +42,7 @@ class Verilator(AutotoolsPackage):
version("master", branch="master") version("master", branch="master")
version("5.028", sha256="02d4b6f34754b46a97cfd70f5fcbc9b730bd1f0a24c3fc37223397778fcb142c")
version("5.026", sha256="87fdecf3967007d9ee8c30191ff2476f2a33635d0e0c6e3dbf345cc2f0c50b78") version("5.026", sha256="87fdecf3967007d9ee8c30191ff2476f2a33635d0e0c6e3dbf345cc2f0c50b78")
version("5.024", sha256="88b04c953e7165c670d6a700f202cef99c746a0867b4e2efe1d7ea789dee35f3") version("5.024", sha256="88b04c953e7165c670d6a700f202cef99c746a0867b4e2efe1d7ea789dee35f3")
version("5.022", sha256="3c2f5338f4b6ce7e2f47a142401acdd18cbf4c5da06092618d6d036c0afef12d") version("5.022", sha256="3c2f5338f4b6ce7e2f47a142401acdd18cbf4c5da06092618d6d036c0afef12d")
@ -86,6 +87,8 @@ class Verilator(AutotoolsPackage):
conflicts("%gcc@:6", msg="C++14 support required") conflicts("%gcc@:6", msg="C++14 support required")
patch("fix_compile_gch.patch", level=1, when="@5.0.18:")
# we need to fix the CXX and LINK paths, as they point to the spack # we need to fix the CXX and LINK paths, as they point to the spack
# wrapper scripts which aren't usable without spack # wrapper scripts which aren't usable without spack
filter_compiler_wrappers("verilated.mk", relative_root="include") filter_compiler_wrappers("verilated.mk", relative_root="include")