Herwig3: make njet, vbfnlo dependencies optional... (#33941)

* Herwig3: make njet, vbfnlo dependencies optional...
  also drop openloops dependency when building on PowerPC
* Update package.py

1 files changed, 17 insertions, 8 deletions

diff --git a/var/spack/repos/builtin/packages/herwig3/package.py b/var/spack/repos/builtin/packages/herwig3/package.py
index fbda19fccf..d092b78d0c 100644
--- a/var/spack/repos/builtin/packages/herwig3/package.py
+++ b/var/spack/repos/builtin/packages/herwig3/package.py
@@ -33,14 +33,22 @@ class Herwig3(AutotoolsPackage):
     depends_on("python", type=("build", "run"))
     depends_on("gsl")
     depends_on("fastjet")
-    depends_on("vbfnlo@3:")
+    depends_on("vbfnlo@3:", when="+vbfnlo")
     depends_on("madgraph5amc")
+    depends_on("njet", when="+njet")
+    depends_on("py-gosam")
     depends_on("njet")
     depends_on("gosam-contrib")
-    depends_on("openloops")
+
+    # OpenLoops fail to build on PPC64: error: detected recursion whilst expanding macro "vector"
+    depends_on("openloops", when="target=aarch64:")
+    depends_on("openloops", when="target=x86_64:")
 
     force_autoreconf = True
 
+    variant("vbfnlo", default=True, description="Use VBFNLO")
+    variant("njet", default=True, description="Use NJet")
+
     def autoreconf(self, spec, prefix):
         autoreconf("--install", "--verbose", "--force")
 
@@ -54,11 +62,16 @@ class Herwig3(AutotoolsPackage):
             "--with-madgraph=" + self.spec["madgraph5amc"].prefix,
             "--with-openloops=" + self.spec["openloops"].prefix,
             "--with-gosam-contrib=" + self.spec["gosam-contrib"].prefix,
-            "--with-njet=" + self.spec["njet"].prefix,
-            "--with-vbfnlo=" + self.spec["vbfnlo"].prefix,
             "--with-evtgen=" + self.spec["evtgen"].prefix,
+            "--with-gosam=" + self.spec["py-gosam"].prefix,
         ]
 
+        if self.spec.satisfies("+njet"):
+            args.append("--with-njet=" + self.spec["njet"].prefix)
+
+        if self.spec.satisfies("+vbfnlo"):
+            args.append("--with-vbfnlo=" + self.spec["vbfnlo"].prefix)
+
         return args
 
     def flag_handler(self, name, flags):
@@ -76,10 +89,6 @@ class Herwig3(AutotoolsPackage):
 
     def build(self, spec, prefix):
         make()
-        with working_dir("MatrixElement/FxFx"):
-            make()
 
     def install(self, spec, prefix):
         make("install")
-        with working_dir("MatrixElement/FxFx"):
-            make("install")