From 156f256db647b805a23465c296f45a4aef7c53ea Mon Sep 17 00:00:00 2001 From: Auriane R <48684432+aurianer@users.noreply.github.com> Date: Fri, 12 Jan 2024 15:40:33 +0100 Subject: Add conflicts between otf2 version 3 and apex version < 2.6 (#42060) --- var/spack/repos/builtin/packages/apex/package.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/var/spack/repos/builtin/packages/apex/package.py b/var/spack/repos/builtin/packages/apex/package.py index 8012c3e56b..dd3223f00e 100644 --- a/var/spack/repos/builtin/packages/apex/package.py +++ b/var/spack/repos/builtin/packages/apex/package.py @@ -115,6 +115,9 @@ class Apex(CMakePackage): # Conflicts conflicts("+jemalloc", when="+gperftools") conflicts("+plugins", when="~activeharmony") + # Compatibility fixed in 2.6.0 with + # https://github.com/UO-OACISS/apex/commit/4a7bdbb93367c3b1172ccb978825c67316f8bf4a + conflicts("^otf2@3:", when="@:2.5") # https://github.com/UO-OACISS/apex/pull/177#issuecomment-1726322959 conflicts("+openmp", when="%gcc") -- cgit v1.2.3-70-g09d2