From d2462fb0af50ca5a87ae4d2aef700eb314a1e373 Mon Sep 17 00:00:00 2001 From: Juan Miguel Carceller <22276694+jmcarcell@users.noreply.github.com> Date: Sat, 30 Dec 2023 22:58:21 +0100 Subject: gaudi: add a patch for catch2 (#41177) * gaudi: add a patch for catch2 * Fix indentation * Add a diff at the end of the path * gaudi: canonicalize patch url * gaudi: canonicalize patch url for gitlab diff --------- Co-authored-by: jmcarcell Co-authored-by: Wouter Deconinck --- var/spack/repos/builtin/packages/gaudi/package.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/var/spack/repos/builtin/packages/gaudi/package.py b/var/spack/repos/builtin/packages/gaudi/package.py index 9265d2c296..73cd0937d4 100644 --- a/var/spack/repos/builtin/packages/gaudi/package.py +++ b/var/spack/repos/builtin/packages/gaudi/package.py @@ -55,6 +55,12 @@ class Gaudi(CMakePackage): patch("link_target_fixes.patch", when="@33.0:34") patch("link_target_fixes32.patch", when="@:32.2") patch("fmt_fix.patch", when="@36.6:36.12 ^fmt@10:") + # fix issues with catch2 3.1 and above + patch( + "https://gitlab.cern.ch/gaudi/Gaudi/-/commit/110f2189f386c3a23150ccdfdc47c1858fc7098e.diff", + sha256="b05f6b7c1efb8c3af291c8d81fd1627e58af7c5f9a78a0098c6e3bfd7ec80c15", + when="@37.1 ^catch2@3.1:", + ) # These dependencies are needed for a minimal Gaudi build depends_on("aida") -- cgit v1.2.3-60-g2f50