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

Attempt to fix #18

Browse Source
This commit is contained in:
probonopd
2016-09-14 00:28:24 +02:00
committed by GitHub
parent 67b6c92a50
commit ec3230952e
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shared/shared.cpp
+4 -4
View File
@@ -146,8 +146,8 @@ LddInfo findDependencyInfo(const QString &binaryPath)
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 ldd output:" << output; LogError() << "Could not parse ldd output under 2 lines:" << output;
} }
return info; return info;
} }
@@ -159,12 +159,12 @@ LddInfo findDependencyInfo(const QString &binaryPath)
} }
} }
if (binaryPath.contains(".so.") || binaryPath.endsWith(".so")) { if ((binaryPath.contains(".so.") || binaryPath.endsWith(".so")) and (!output.contains("linux-vdso.so.1"))) {
const auto match = regexp.match(outputLines.first()); const auto match = regexp.match(outputLines.first());
if (match.hasMatch()) { if (match.hasMatch()) {
info.installName = match.captured(1); info.installName = match.captured(1);
} else { } else {
LogError() << "Could not parse objdump output line:" << outputLines.first(); LogError() << "Could not parse ldd output line:" << outputLines.first();
} }
outputLines.removeFirst(); outputLines.removeFirst();
} }