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

glibc: detect from "Free Software Foundation" not "gnu" (#44154)

Browse Source 
which should be more generic
This commit is contained in:
Harmen Stoppels
2024-05-13 20:11:27 +02:00
committed by GitHub
parent eaf330f2a8
commit 4f111659ec
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/spack/spack/util/libc.py
View File

@@ -22,7 +22,7 @@ def _libc_from_ldd(ldd: str) -> Optional["spack.spec.Spec"]:
except Exception: except Exception:
return None return None
if not re.search(r"\b(?:gnu|glibc|arm)\b", stdout, re.IGNORECASE): if not re.search(r"\bFree Software Foundation\b", stdout):
return None return None
version_str = re.match(r".+\(.+\) (.+)", stdout) version_str = re.match(r".+\(.+\) (.+)", stdout)
@@ -75,7 +75,7 @@ def libc_from_dynamic_linker(dynamic_linker: str) -> Optional["spack.spec.Spec"]
return spec return spec
except Exception: except Exception:
return None return None
elif re.search(r"\b(?:gnu|glibc|arm)\b", stdout, re.IGNORECASE): elif re.search(r"\bFree Software Foundation\b", stdout):
# output is like "ld.so (...) stable release version 2.33." # output is like "ld.so (...) stable release version 2.33."
match = re.search(r"version (\d+\.\d+(?:\.\d+)?)", stdout) match = re.search(r"version (\d+\.\d+(?:\.\d+)?)", stdout)
if not match: if not match: