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

Make ldd detect pre-existing libraries in the AppDir

Browse Source
This commit is contained in:
probonopd
2017-11-09 18:53:12 +01:00
committed by GitHub
parent 7c20299686
commit b5e9de7331
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/linuxdeployqt/shared.cpp
+12 -2
View File
@@ -239,8 +239,8 @@ bool copyFilePrintStatus(const QString &from, const QString &to)
if (alwaysOwerwriteEnabled) { if (alwaysOwerwriteEnabled) {
QFile(to).remove(); QFile(to).remove();
} else { } else {
LogDebug() << QFileInfo(to).fileName() << "already deployed, skipping."; LogDebug() << QFileInfo(to).fileName() << "already exists at target location";
return false; return true;
} }
} }
@@ -1067,6 +1067,16 @@ DeploymentInfo deployQtLibraries(const QString &appDirPath, const QStringList &a
} else { } else {
libraryPath = QFileInfo(applicationBundle.binaryPath).dir().filePath("../lib/" + bundleLibraryDirectory); libraryPath = QFileInfo(applicationBundle.binaryPath).dir().filePath("../lib/" + bundleLibraryDirectory);
} }
/* Make ldd detect pre-existing libraries in the AppDir.
* TODO: Consider searching the AppDir for .so* files outside of libraryPath
* and warning about them not being taken into consideration */
QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
QString oldPath = env.value("LD_LIBRARY_PATH");
QString newPath = libraryPath + ":" + oldPath; // FIXME: If we use a ldd replacement, we still need to observe this path
LogDebug() << "Changed LD_LIBRARY_PATH:" << newPath;
setenv("LD_LIBRARY_PATH",newPath.toUtf8().constData(),1);
foreach (const QString &executable, QStringList() << applicationBundle.binaryPath << additionalExecutables) { foreach (const QString &executable, QStringList() << applicationBundle.binaryPath << additionalExecutables) {
changeIdentification("$ORIGIN/" + QFileInfo(executable).dir().relativeFilePath(libraryPath) + "/" + bundleLibraryDirectory, QFileInfo(executable).canonicalFilePath()); changeIdentification("$ORIGIN/" + QFileInfo(executable).dir().relativeFilePath(libraryPath) + "/" + bundleLibraryDirectory, QFileInfo(executable).canonicalFilePath());
} }