mirror of
https://github.com/audacity/linuxdeploy.git
synced 2026-02-03 19:46:41 -06:00
Filter out VDSO obj and interpreter
This commit is contained in:
parent
1ec9a59c91
commit
287c4364e2
@ -217,7 +217,23 @@ namespace linuxdeploy {
|
|||||||
const boost::regex expr(R"(\s*(.+)\s+\=>\s+(.+)\s+\((.+)\)\s*)");
|
const boost::regex expr(R"(\s*(.+)\s+\=>\s+(.+)\s+\((.+)\)\s*)");
|
||||||
boost::smatch what;
|
boost::smatch what;
|
||||||
|
|
||||||
for (const auto& line : util::splitLines(result.stdout_string())) {
|
auto lddLines = util::splitLines(result.stdout_string());
|
||||||
|
|
||||||
|
// filter known-problematic, known-unneeded lines
|
||||||
|
// see https://github.com/linuxdeploy/linuxdeploy/issues/210
|
||||||
|
lddLines.erase(
|
||||||
|
std::remove_if(lddLines.begin(), lddLines.end(), [&lddLines](auto line) {
|
||||||
|
if (util::stringContains(line, "linux-vdso.so") || util::stringContains(line, "ld-linux-")) {
|
||||||
|
ldLog() << LD_DEBUG << "skipping linker related object" << line << std::endl;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}),
|
||||||
|
lddLines.end()
|
||||||
|
);
|
||||||
|
|
||||||
|
for (const auto& line : lddLines) {
|
||||||
if (boost::regex_search(line, what, expr)) {
|
if (boost::regex_search(line, what, expr)) {
|
||||||
auto libraryPath = what[2].str();
|
auto libraryPath = what[2].str();
|
||||||
util::trim(libraryPath);
|
util::trim(libraryPath);
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user