hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

dock: fix compilation with gcc10+, add dep (#33034)

Browse source
This commit is contained in:
snehring 2022-10-06 02:57:14 -05:00 committed by GitHub
parent 33b1425add
commit 6de5f58026
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
var/spack/repos/builtin/packages/dock/package.py
View file

@ -17,6 +17,7 @@ class Dock(Package):
homepage = "http://dock.compbio.ucsf.edu/DOCK_6/index.htm" homepage = "http://dock.compbio.ucsf.edu/DOCK_6/index.htm"
url = "file://{0}/dock.6.9_source.tar.gz".format(os.getcwd()) url = "file://{0}/dock.6.9_source.tar.gz".format(os.getcwd())
maintainers = ["snehring"]
manual_download = True manual_download = True
version("6.9", sha256="c2caef9b4bb47bb0cb437f6dc21f4c605fd3d0d9cc817fa13748c050dc87a5a8") version("6.9", sha256="c2caef9b4bb47bb0cb437f6dc21f4c605fd3d0d9cc817fa13748c050dc87a5a8")
@ -24,6 +25,7 @@ class Dock(Package):
variant("mpi", default=True, description="Enable mpi") variant("mpi", default=True, description="Enable mpi")
depends_on("bison", type="build") depends_on("bison", type="build")
depends_on("flex", type="build")
depends_on("mpi", when="+mpi") depends_on("mpi", when="+mpi")
def setup_build_environment(self, env): def setup_build_environment(self, env):
@ -49,9 +51,18 @@ def install(self, spec, prefix):
with working_dir("install"): with working_dir("install"):
sh_args = ["./configure", compiler_targets[self.compiler.name]] sh_args = ["./configure", compiler_targets[self.compiler.name]]
config_source = compiler_targets[self.compiler.name]
if "+mpi" in spec: if "+mpi" in spec:
sh_args.append("parallel") sh_args.append("parallel")
config_source = config_source + ".parallel"
if self.spec.satisfies("@6.9%gcc@10:"):
# Versions of gcc before 10 treat mismatched arguments as a warning
# 10+ makes it an error. This makes it a warning again
filter_file(
r"(-fno-second-underscore)", r"\1 -fallow-argument-mismatch", config_source
)
which("sh")(*sh_args) which("sh")(*sh_args)
which("make")("YACC=bison -o y.tab.c") which("make")("YACC=bison -o y.tab.c")