From 6be28aa303548e936d9bdcae2edb6c5f91183010 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Fri, 17 May 2024 14:31:05 -0500 Subject: [PATCH] pythia8: patch latest 8.311 for upstream bug (#43803) * pythia8: prefer 8.310 * [@spackbot] updating style on behalf of wdconinc * pythia8: filter_file to remove sed n * Revert "[@spackbot] updating style on behalf of wdconinc" This reverts commit e2a3decaffbd3f464d1bd992025e1812df49f088. * Revert "pythia8: prefer 8.310" This reverts commit 568cb056b87129085e245d9dbef1732ee1c6c0aa. * [@spackbot] updating style on behalf of wdconinc * pythia8: comment for fix * pythia8: fix style * pythia8: filter_file with raw string because of escaped pipe --------- Co-authored-by: wdconinc --- var/spack/repos/builtin/packages/pythia8/package.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/var/spack/repos/builtin/packages/pythia8/package.py b/var/spack/repos/builtin/packages/pythia8/package.py index 0086f2b7309..a1767450ea2 100644 --- a/var/spack/repos/builtin/packages/pythia8/package.py +++ b/var/spack/repos/builtin/packages/pythia8/package.py @@ -134,6 +134,13 @@ def setup_cxxstd(self): r"-std=c\+\+[0-9][0-9]", f"-std=c++{self.spec.variants['cxxstd'].value}", "configure" ) + # Fix for https://gitlab.com/Pythia8/releases/-/issues/428 + @when("@:8.311") + def patch(self): + filter_file( + r"[/]examples[/]Makefile[.]inc\|;n' \\", "/examples/Makefile.inc|' \\", "configure" + ) + def configure_args(self): args = []