diff options
Diffstat (limited to 'var')
-rw-r--r-- | var/spack/repos/builtin/packages/gosam-contrib/package.py | 8 | ||||
-rw-r--r-- | var/spack/repos/builtin/packages/qgraf/package.py | 3 | ||||
-rw-r--r-- | var/spack/repos/builtin/packages/whizard/package.py | 7 |
3 files changed, 16 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/gosam-contrib/package.py b/var/spack/repos/builtin/packages/gosam-contrib/package.py index ab60938f49..0c1fbcb5f3 100644 --- a/var/spack/repos/builtin/packages/gosam-contrib/package.py +++ b/var/spack/repos/builtin/packages/gosam-contrib/package.py @@ -17,6 +17,9 @@ class GosamContrib(AutotoolsPackage): version("2.0", sha256="c05beceea74324eb51c1049773095e2cb0c09c8c909093ee913d8b0da659048d") version("1.0", sha256="a29d4232d9190710246abc2ed97fdcd8790ce83580f56a360f3456b0377c40ec") + # whizard checks for .la files ( but does not use them ) + install_libtool_archives = True + variant( "libs", default="shared,static", @@ -26,6 +29,11 @@ class GosamContrib(AutotoolsPackage): ) variant("pic", default=False, description="Build position-independent code") + def patch(self): + # remove spack compiler wrapper path + mf = FileFilter("gosam.conf.in") + mf.filter("^fc.bin=.*", "fc.bin=" + self.compiler.fc) + def flag_handler(self, name, flags): if name in ["cflags", "cxxflags", "cppflags"]: if "+pic" in self.spec: diff --git a/var/spack/repos/builtin/packages/qgraf/package.py b/var/spack/repos/builtin/packages/qgraf/package.py index 722d97b8fa..1d2fe3dc3f 100644 --- a/var/spack/repos/builtin/packages/qgraf/package.py +++ b/var/spack/repos/builtin/packages/qgraf/package.py @@ -20,4 +20,5 @@ class Qgraf(Package): def install(self, spec, prefix): fortran = Executable(spack_fc) fortran("qgraf-{0}.f".format(self.spec.version), "-o", "qgraf") - install_tree(".", prefix) + mkdirp(prefix.bin) + install("./qgraf", prefix.bin) diff --git a/var/spack/repos/builtin/packages/whizard/package.py b/var/spack/repos/builtin/packages/whizard/package.py index 132adc0dab..d553119c52 100644 --- a/var/spack/repos/builtin/packages/whizard/package.py +++ b/var/spack/repos/builtin/packages/whizard/package.py @@ -54,6 +54,7 @@ class Whizard(AutotoolsPackage): variant("pythia8", default=True, description="builds with pythia8") variant("fastjet", default=False, description="builds with fastjet") + variant("gosam", default=False, description="builds with gosam") variant("lcio", default=False, description="builds with lcio") variant("lhapdf", default=False, description="builds with fastjet") variant("openmp", default=False, description="builds with openmp") @@ -70,6 +71,10 @@ class Whizard(AutotoolsPackage): depends_on("pythia8@:8.309", when="@:3.1.3+pythia8") depends_on("lhapdf", when="+lhapdf") depends_on("fastjet", when="+fastjet") + depends_on("py-gosam", when="+gosam") + depends_on("gosam-contrib", when="+gosam") + depends_on("qgraf", when="+gosam") + depends_on( "openloops@2.0.0: +compile_extra num_jobs=1 " "processes=eett,eevvjj,ppllj,tbw", when="+openloops", @@ -143,10 +148,10 @@ class Whizard(AutotoolsPackage): # todo: hoppet # todo: recola # todo: looptools - # todo: gosam # todo: pythia6 ] args.extend(self.enable_or_disable("fastjet")) + args.extend(self.enable_or_disable("gosam")) args.extend(self.enable_or_disable("pythia8")) args.extend(self.enable_or_disable("lcio")) args.extend(self.enable_or_disable("lhapdf")) |