summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuan Miguel Carceller <22276694+jmcarcell@users.noreply.github.com>2023-12-30 22:58:21 +0100
committerGitHub <noreply@github.com>2023-12-30 14:58:21 -0700
commitd2462fb0af50ca5a87ae4d2aef700eb314a1e373 (patch)
tree84deda0c7e492b6e62ef816bbc14cf56188fdf31
parent32278eecb775fb7560d06ace64e7f431d2034883 (diff)
downloadspack-d2462fb0af50ca5a87ae4d2aef700eb314a1e373.tar.gz
spack-d2462fb0af50ca5a87ae4d2aef700eb314a1e373.tar.bz2
spack-d2462fb0af50ca5a87ae4d2aef700eb314a1e373.tar.xz
spack-d2462fb0af50ca5a87ae4d2aef700eb314a1e373.zip
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 <jmcarcell@users.noreply.github.com> Co-authored-by: Wouter Deconinck <wdconinc@gmail.com>
-rw-r--r--var/spack/repos/builtin/packages/gaudi/package.py6
1 files changed, 6 insertions, 0 deletions
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")