Updating hiredis with new software versions (#33982)

1 files changed, 25 insertions, 6 deletions

diff --git a/var/spack/repos/builtin/packages/hiredis/package.py b/var/spack/repos/builtin/packages/hiredis/package.py
index ed0dfe4aea..6cc3df3473 100644
--- a/var/spack/repos/builtin/packages/hiredis/package.py
+++ b/var/spack/repos/builtin/packages/hiredis/package.py
@@ -6,21 +6,40 @@
 from spack.package import *
 
 
-class Hiredis(MakefilePackage):
+class Hiredis(CMakePackage, MakefilePackage):
     """Hiredis is a minimalistic C client library for the Redis database."""
 
     homepage = "https://github.com/redis/hiredis"
     url = "https://github.com/redis/hiredis/archive/v0.14.1.tar.gz"
+    git = "https://github.com/redis/hiredis"
 
+    maintainers = ["rblake-llnl"]
+
+    build_system(
+        conditional("cmake", when="@1:"),
+        conditional("makefile", when="@0"),
+        default="cmake",
+    )
+
+    version("1.0.2", sha256="e0ab696e2f07deb4252dda45b703d09854e53b9703c7d52182ce5a22616c3819")
+    version("1.0.1", sha256="a420df40775ac7b4b46550dd4df78ffe6620616333496a17c9c9fc556815ba4b")
+    version("1.0.0", sha256="2a0b5fe5119ec973a0c1966bfc4bd7ed39dbce1cb6d749064af9121fe971936f")
     version("0.14.1", sha256="2663b2aed9fd430507e30fc5e63274ee40cdd1a296026e22eafd7d99b01c8913")
     version("0.14.0", sha256="042f965e182b80693015839a9d0278ae73fae5d5d09d8bf6d0e6a39a8c4393bd")
     version("0.13.3", sha256="717e6fc8dc2819bef522deaca516de9e51b9dfa68fe393b7db5c3b6079196f78")
     version("0.13.2", sha256="b0cf73ebe039fe25ecaaa881acdda8bdc393ed997e049b04fc20865835953694")
 
-    def install(self, spec, prefix):
+
+def darwin_fix(builder):
+    fix_darwin_install_name(builder.pkg.prefix.lib)
+
+
+class MakefileBuilder(spack.build_systems.makefile.MakefileBuilder):
+    def install(self, pkg, spec, prefix):
         make("PREFIX={0}".format(prefix), "install")
 
-    @run_after("install")
-    def darwin_fix(self):
-        if self.spec.satisfies("platform=darwin"):
-            fix_darwin_install_name(self.prefix.lib)
+    run_after("install", when="platform=darwin")(darwin_fix)
+
+
+class CMakeBuilder(spack.build_systems.cmake.CMakeBuilder):
+    run_after("install", when="platform=darwin")(darwin_fix)