mirrors/uv
1
0
Fork 0
mirror of https://github.com/astral-sh/uv.git synced 2025-08-03 18:38:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Remove -isysroot when patching sysconfig (#9860)

Browse source 
## Summary

This is equivalent to
https://github.com/indygreg/python-build-standalone/pull/414, but at
install-time, so that it affects older Python builds too.
This commit is contained in:
Charlie Marsh 2024-12-13 14:49:27 -05:00 • committed by GitHub
parent d2fb4c585d
commit 08ea79cc33
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 45 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

45
crates/uv-python/src/sysconfig/mod.rs
View file

@ -135,6 +135,21 @@ fn patch_sysconfigdata(mut data: SysconfigData, real_prefix: &Path) -> Sysconfig
.join(" ")
}
/// Remove any references to `-isysroot` in a whitespace-separated string.
fn remove_isysroot(s: &str) -> String {
// If we see `-isysroot`, drop it and the next part.
let mut parts = s.split_whitespace().peekable();
let mut result = Vec::with_capacity(parts.size_hint().0);
while let Some(part) = parts.next() {
if part == "-isysroot" {
parts.next();
} else {
result.push(part);
}
}
result.join(" ")
}
// Patch each value, as needed.
let mut count = 0;
for (key, value) in data.iter_mut() {
@ -142,6 +157,7 @@ fn patch_sysconfigdata(mut data: SysconfigData, real_prefix: &Path) -> Sysconfig
continue;
};
let patched = update_prefix(value, real_prefix);
let patched = remove_isysroot(&patched);
if *value != patched {
trace!("Updated `{key}` from `{value}` to `{patched}`");
count += 1;
@ -184,6 +200,9 @@ mod tests {
fn update_real_prefix() -> Result<(), Error> {
let sysconfigdata = [
("BASEMODLIBS", ""),
("BINDIR", "/install/bin"),
("BINLIBDEST", "/install/lib/python3.10"),
("BLDLIBRARY", "-L. -lpython3.10"),
("BUILDPYTHON", "python.exe"),
("prefix", "/install/prefix"),
("exec_prefix", "/install/exec_prefix"),
@ -200,6 +219,9 @@ mod tests {
# system configuration generated and used by the sysconfig module
build_time_vars = {
"BASEMODLIBS": "",
"BINDIR": "/real/prefix/bin",
"BINLIBDEST": "/real/prefix/lib/python3.10",
"BLDLIBRARY": "-L. -lpython3.10",
"BUILDPYTHON": "python.exe",
"PYTHON_BUILD_STANDALONE": 1,
"base": "/real/prefix/base",
@ -210,4 +232,27 @@ mod tests {
Ok(())
}
#[test]
fn remove_isysroot() -> Result<(), Error> {
let sysconfigdata = [
("BLDSHARED", "clang -bundle -undefined dynamic_lookup -arch arm64 -isysroot /Applications/MacOSX14.2.sdk"),
]
.into_iter()
.map(|(k, v)| (k.to_string(), Value::String(v.to_string())))
.collect::<SysconfigData>();
let real_prefix = Path::new("/real/prefix");
let data = patch_sysconfigdata(sysconfigdata, real_prefix);
insta::assert_snapshot!(data.to_string_pretty()?, @r###"
# system configuration generated and used by the sysconfig module
build_time_vars = {
"BLDSHARED": "clang -bundle -undefined dynamic_lookup -arch arm64",
"PYTHON_BUILD_STANDALONE": 1
}
"###);
Ok(())
}
}