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

Better detection of Python libs/headers (#39308)

Browse Source
This commit is contained in:
Adam J. Stewart 2023-09-18 17:46:33 -05:00 committed by GitHub
parent 4fd7fa5fc1
commit dbd520f851
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/spack/spack/build_systems/python.py
View File

@ -319,9 +319,12 @@ def list_url(cls):
def headers(self): def headers(self):
"""Discover header files in platlib.""" """Discover header files in platlib."""
# Remove py- prefix in package name
name = self.spec.name[3:]
# Headers may be in either location # Headers may be in either location
include = self.prefix.join(self.spec["python"].package.include) include = self.prefix.join(self.spec["python"].package.include).join(name)
platlib = self.prefix.join(self.spec["python"].package.platlib) platlib = self.prefix.join(self.spec["python"].package.platlib).join(name)
headers = fs.find_all_headers(include) + fs.find_all_headers(platlib) headers = fs.find_all_headers(include) + fs.find_all_headers(platlib)
if headers: if headers:
@ -335,11 +338,12 @@ def libs(self):
"""Discover libraries in platlib.""" """Discover libraries in platlib."""
# Remove py- prefix in package name # Remove py- prefix in package name
library = "lib" + self.spec.name[3:].replace("-", "?") name = self.spec.name[3:]
root = self.prefix.join(self.spec["python"].package.platlib)
root = self.prefix.join(self.spec["python"].package.platlib).join(name)
libs = fs.find_all_libraries(root, recursive=True)
for shared in [True, False]:
libs = fs.find_libraries(library, root, shared=shared, recursive=True)
if libs: if libs:
return libs return libs