From 4b866e8ffc69d89064cf011675f63de12684ef76 Mon Sep 17 00:00:00 2001
From: kwryankrattiger <80296582+kwryankrattiger@users.noreply.github.com>
Date: Tue, 11 Oct 2022 14:04:22 -0500
Subject: Darshan variant cleanup (#33165)

* Darshan-Runtime: Cleanup version dependent variants

* Darshan-Util: Cleanup version dependent variants.
---
 .../builtin/packages/darshan-runtime/package.py    | 22 ++++------------------
 .../repos/builtin/packages/darshan-util/package.py | 18 +++++++++---------
 2 files changed, 13 insertions(+), 27 deletions(-)

(limited to 'var')

diff --git a/var/spack/repos/builtin/packages/darshan-runtime/package.py b/var/spack/repos/builtin/packages/darshan-runtime/package.py
index f6fd0e191d..dc3b00252d 100644
--- a/var/spack/repos/builtin/packages/darshan-runtime/package.py
+++ b/var/spack/repos/builtin/packages/darshan-runtime/package.py
@@ -63,14 +63,15 @@ class DarshanRuntime(AutotoolsPackage):
     depends_on("m4", type="build", when="@3.4.0:")
 
     variant("mpi", default=True, description="Compile with MPI support")
-    variant("hdf5", default=False, description="Compile with HDF5 module")
-    variant("apmpi", default=False, description="Compile with AutoPerf MPI module")
+    variant("hdf5", default=False, description="Compile with HDF5 module", when="@3.2:")
+    variant("apmpi", default=False, description="Compile with AutoPerf MPI module", when="@3.3:")
     variant(
         "apmpi_sync",
         default=False,
         description="Compile with AutoPerf MPI module (with collective synchronization timing)",
+        when="@3.3:",
     )
-    variant("apxc", default=False, description="Compile with AutoPerf XC module")
+    variant("apxc", default=False, description="Compile with AutoPerf XC module", when="@3.3:")
     variant(
         "scheduler",
         default="NONE",
@@ -79,21 +80,6 @@ class DarshanRuntime(AutotoolsPackage):
         multi=False,
     )
 
-    conflicts(
-        "+hdf5", when="@:3.1.8", msg="+hdf5 variant only available starting from version 3.2.0"
-    )
-    conflicts(
-        "+apmpi", when="@:3.2.1", msg="+apmpi variant only available starting from version 3.3.0"
-    )
-    conflicts(
-        "+apmpi_sync",
-        when="@:3.2.1",
-        msg="+apmpi variant only available starting from version 3.3.0",
-    )
-    conflicts(
-        "+apxc", when="@:3.2.1", msg="+apxc variant only available starting from version 3.3.0"
-    )
-
     @property
     def configure_directory(self):
         return "darshan-runtime"
diff --git a/var/spack/repos/builtin/packages/darshan-util/package.py b/var/spack/repos/builtin/packages/darshan-util/package.py
index 645b9c274d..4f878b07d6 100644
--- a/var/spack/repos/builtin/packages/darshan-util/package.py
+++ b/var/spack/repos/builtin/packages/darshan-util/package.py
@@ -46,8 +46,15 @@ class DarshanUtil(AutotoolsPackage):
     version("3.0.0", sha256="95232710f5631bbf665964c0650df729c48104494e887442596128d189da43e0")
 
     variant("bzip2", default=False, description="Enable bzip2 compression")
-    variant("apmpi", default=False, description="Compile with AutoPerf MPI module support")
-    variant("apxc", default=False, description="Compile with AutoPerf XC module support")
+    variant(
+        "apmpi",
+        default=False,
+        description="Compile with AutoPerf MPI module support",
+        when="@3.3:",
+    )
+    variant(
+        "apxc", default=False, description="Compile with AutoPerf XC module support", when="@3.3:"
+    )
 
     depends_on("zlib")
     depends_on("bzip2", when="+bzip2", type=("build", "link", "run"))
@@ -62,13 +69,6 @@ class DarshanUtil(AutotoolsPackage):
 
     patch("retvoid.patch", when="@3.2.0:3.2.1")
 
-    conflicts(
-        "+apmpi", when="@:3.2.1", msg="+apmpi variant only available starting from version 3.3.0"
-    )
-    conflicts(
-        "+apxc", when="@:3.2.1", msg="+apxc variant only available starting from version 3.3.0"
-    )
-
     @property
     def configure_directory(self):
         return "darshan-util"
-- 
cgit v1.2.3-70-g09d2