MahnoKropotkinvich/redox
1
0
Fork 0
mirror of https://gitlab.redox-os.org/redox-os/redox.git synced 2026-11-05 04:06:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'rpath-mednafen' into 'master'

Browse Source 
Warn of custom rpath, fix mednafen rpath

See merge request redox-os/redox!2326
This commit is contained in:
Jeremy Soller 2026-09-03 18:50:15 -06:00
commit 9052f66679
2 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
recipes/emulators/mednafen/recipe.toml
View File

@ -17,9 +17,9 @@ dependencies = [
]
script = """
DYNAMIC_INIT
export SDL_LIBS="-lSDL2 -lorbital $("${TARGET}-pkg-config" --libs osmesa) -lstdc++"
COOKBOOK_CONFIGURE_FLAGS+=(
--without-libflac
--disable-rpath
)
cookbook_configure
"""

38
src/cook/cook_build.rs
View File

@ -87,23 +87,27 @@ fn auto_deps_from_dynamic_linking(
let object::build::elf::Dynamic::String { tag, val } = dynamic else {
continue;
};
if *tag == object::elf::DT_NEEDED {
let Ok(name) = str::from_utf8(val) else {
continue;
};
if let Ok(relative_path) = path.strip_prefix(rel_path)
&& verbose
{
log_to_pty!(logger, "DEBUG: {} needs {}", relative_path.display(), name);
let Ok(name) = str::from_utf8(val) else {
continue;
};
let path_rel = path
.strip_prefix(rel_path)
.ok()
.filter(|_| verbose)
.map(|s| s.display());
match *tag {
object::elf::DT_NEEDED => {
if let Some(path_rel) = path_rel {
log_to_pty!(logger, "DEBUG: {} needs {}", path_rel, name);
}
needed.insert(name.to_string());
}
needed.insert(name.to_string());
} else {
log_to_pty!(
logger,
"DEBUG: autopath failed {} is outside {}",
path.display(),
rel_path.display()
);
object::elf::DT_RPATH | object::elf::DT_RUNPATH => {
if let Some(path_rel) = path_rel {
log_to_pty!(logger, "DEBUG: {} uses runpath {}", path_rel, name);
}
}
_ => {} // DT_SONAME
}
}
}
@ -148,7 +152,7 @@ fn auto_deps_from_dynamic_linking(
if verbose {
for name in missing {
log_to_pty!(logger, "INFO: {} missing", name);
log_to_pty!(logger, "INFO: missing {}", name);
}
}