TianZD/linuxdeployqt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Increase verbosity and leave the first line in a try to solve #5

Browse Source
This commit is contained in:
probonopd
2016-09-08 15:59:19 +02:00
committed by GitHub
parent dc665c69e3
commit 43e8640d90
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shared/shared.cpp
+9 -4
View File
@@ -141,19 +141,24 @@ LddInfo findDependencyInfo(const QString &binaryPath)
return info; return info;
} }
static const QRegularExpression regexp(QStringLiteral( static const QRegularExpression regexp(QStringLiteral("^.+ => (.+) \\("));
"^.+ => (.+) \\("));
QString output = ldd.readAllStandardOutput(); QString output = ldd.readAllStandardOutput();
QStringList outputLines = output.split("\n", QString::SkipEmptyParts); QStringList outputLines = output.split("\n", QString::SkipEmptyParts);
if (outputLines.size() < 2) { if (outputLines.size() < 2) {
if (output.contains("statically linked") == false){ if (output.contains("statically linked") == false){
LogError() << "Could not parse objdump output:" << output; LogError() << "Could not parse ldd output:" << output;
} }
return info; return info;
} }
outputLines.removeFirst(); // remove line containing the binary path foreach (QString outputLine, outputLines) {
LogDebug() << "ldd outputLine:" << outputLine;
if (outputLine.contains("not found")){
LogError() << "ldd outputLine:" << outputLine;
}
}
if (binaryPath.contains(".so.") || binaryPath.endsWith(".so")) { if (binaryPath.contains(".so.") || binaryPath.endsWith(".so")) {
const auto match = regexp.match(outputLines.first()); const auto match = regexp.match(outputLines.first());
if (match.hasMatch()) { if (match.hasMatch()) {