zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix a few odd packages

Browse Source
This commit is contained in:
Harmen Stoppels 2024-11-11 12:51:16 +01:00
parent f20803ab3b
commit d20e3fbd84
4 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
var/spack/repos/builtin/packages/apple-libunwind/package.py
View File

@ -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))

2
var/spack/repos/builtin/packages/likwid/package.py
View File

@ -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]),

5
var/spack/repos/builtin/packages/mfem/package.py
View File

@ -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):

2
var/spack/repos/builtin/packages/mpitrampoline/package.py
View File

@ -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):