From d20e3fbd849fc0039dbce68a2163b0d75ececf8a Mon Sep 17 00:00:00 2001
From: Harmen Stoppels <me@harmenstoppels.nl>
Date: Mon, 11 Nov 2024 12:51:16 +0100
Subject: [PATCH] fix a few odd packages

---
 .../repos/builtin/packages/apple-libunwind/package.py     | 8 ++------
 var/spack/repos/builtin/packages/likwid/package.py        | 2 +-
 var/spack/repos/builtin/packages/mfem/package.py          | 5 ++---
 var/spack/repos/builtin/packages/mpitrampoline/package.py | 2 +-
 4 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/var/spack/repos/builtin/packages/apple-libunwind/package.py b/var/spack/repos/builtin/packages/apple-libunwind/package.py
index 1c989ad9846..2536d227bc2 100644
--- a/var/spack/repos/builtin/packages/apple-libunwind/package.py
+++ b/var/spack/repos/builtin/packages/apple-libunwind/package.py
@@ -66,13 +66,9 @@ def libs(self):
         it will link dynamically to `/usr/lib/system/libunwind.dylib`.
 
         """
-        libs = find_libraries("libSystem", self.prefix.lib, shared=True, recursive=False)
-        if libs:
-            return libs
-        return None
+        return find_libraries("libSystem", self.prefix.lib, shared=True, recursive=False)
 
     @property
     def headers(self):
         """Export the Apple libunwind header"""
-        hdrs = HeaderList(find(self.prefix.include, "libunwind.h", recursive=False))
-        return hdrs or None
+        return HeaderList(find(self.prefix.include, "libunwind.h", recursive=False))
diff --git a/var/spack/repos/builtin/packages/likwid/package.py b/var/spack/repos/builtin/packages/likwid/package.py
index 3b690c79ff9..9807fc43bb1 100644
--- a/var/spack/repos/builtin/packages/likwid/package.py
+++ b/var/spack/repos/builtin/packages/likwid/package.py
@@ -195,7 +195,7 @@ def install(self, spec, prefix):
             filter_file("^BUILDAPPDAEMON.*", "BUILDAPPDAEMON = true", "config.mk")
             cudainc = spec["cuda"].prefix.include
             filter_file("^CUDAINCLUDE.*", "CUDAINCLUDE = {0}".format(cudainc), "config.mk")
-            cuptihead = HeaderList(find(spec["cuda"].prefix, "cupti.h", recursive=True))
+            cuptihead = find_headers("cupti", spec["cuda"].prefix, recursive=True)
             filter_file(
                 "^CUPTIINCLUDE.*",
                 "CUPTIINCLUDE = {0}".format(cuptihead.directories[0]),
diff --git a/var/spack/repos/builtin/packages/mfem/package.py b/var/spack/repos/builtin/packages/mfem/package.py
index 49e7d1288dd..e0a12614085 100644
--- a/var/spack/repos/builtin/packages/mfem/package.py
+++ b/var/spack/repos/builtin/packages/mfem/package.py
@@ -1061,7 +1061,7 @@ def find_optional_library(name, prefix):
 
         if "+conduit" in spec:
             conduit = spec["conduit"]
-            headers = HeaderList(find(conduit.prefix.include, "conduit.hpp", recursive=True))
+            headers = find_headers("conduit", conduit.prefix)
             conduit_libs = ["libconduit", "libconduit_relay", "libconduit_blueprint"]
             libs = find_libraries(conduit_libs, conduit.prefix.lib, shared=("+shared" in conduit))
             libs += LibraryList(find_system_libraries("libdl"))
@@ -1280,8 +1280,7 @@ def sundials_components(self):
     @property
     def headers(self):
         """Export the main mfem header, mfem.hpp."""
-        hdrs = HeaderList(find(self.prefix.include, "mfem.hpp", recursive=False))
-        return hdrs or None
+        return find_headers("mfem", self.prefix.include, recursive=False)
 
     @property
     def libs(self):
diff --git a/var/spack/repos/builtin/packages/mpitrampoline/package.py b/var/spack/repos/builtin/packages/mpitrampoline/package.py
index 7d61086b95a..5dcfc1c7285 100644
--- a/var/spack/repos/builtin/packages/mpitrampoline/package.py
+++ b/var/spack/repos/builtin/packages/mpitrampoline/package.py
@@ -71,7 +71,7 @@ def cmake_args(self):
 
     @property
     def headers(self):
-        return HeaderList(find(self.prefix.include, "mpi.h"))
+        return find_headers("mpi.h", self.prefix)
 
     @property
     def libs(self):