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

Attempt to obey pre-existing RPATHs, #52

Browse Source
This commit is contained in:
probonopd
2017-06-10 22:01:00 +00:00
parent 646201dcab
commit 6d4c1d966b
1 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shared/shared.cpp
+18 -3
View File
@@ -670,12 +670,13 @@ QString copyDylib(const LibraryInfo &library, const QString path)
return dylibDestinationBinaryPath; return dylibDestinationBinaryPath;
} }
void runPatchelf(QStringList options) QString runPatchelf(QStringList options)
{ {
QProcess patchelftool; QProcess patchelftool;
LogDebug() << "options:" << options;
patchelftool.start("patchelf", options); patchelftool.start("patchelf", options);
if (!patchelftool.waitForStarted()) { if (!patchelftool.waitForStarted()) {
if(patchelftool.errorString().contains("execvp: No such file or directory")){ if(patchelftool.errorString().contains("No such file or directory")){
LogError() << "Could not start patchelf."; LogError() << "Could not start patchelf.";
LogError() << "Make sure it is installed on your $PATH, e.g., in /usr/local/bin."; LogError() << "Make sure it is installed on your $PATH, e.g., in /usr/local/bin.";
LogError() << "You can get it from https://nixos.org/patchelf.html."; LogError() << "You can get it from https://nixos.org/patchelf.html.";
@@ -687,9 +688,10 @@ void runPatchelf(QStringList options)
patchelftool.waitForFinished(); patchelftool.waitForFinished();
if (patchelftool.exitCode() != 0) { if (patchelftool.exitCode() != 0) {
LogError() << "runPatchelf:" << patchelftool.readAllStandardError(); LogError() << "runPatchelf:" << patchelftool.readAllStandardError();
LogError() << "runPatchelf:" << patchelftool.readAllStandardOutput(); // LogError() << "runPatchelf:" << patchelftool.readAllStandardOutput();
// exit(1); // Do not exit because this could be a script that patchelf can't work on // exit(1); // Do not exit because this could be a script that patchelf can't work on
} }
return(patchelftool.readAllStandardOutput().trimmed());
} }
bool patchQtCore(const QString &path, const QString &variable, const QString &value) bool patchQtCore(const QString &path, const QString &variable, const QString &value)
@@ -742,6 +744,19 @@ bool patchQtCore(const QString &path, const QString &variable, const QString &va
void changeIdentification(const QString &id, const QString &binaryPath) void changeIdentification(const QString &id, const QString &binaryPath)
{ {
LogNormal() << "Checking rpath in" << binaryPath;
QString oldRpath = runPatchelf(QStringList() << "--print-rpath" << binaryPath);
LogDebug() << "oldRpath:" << oldRpath;
if (oldRpath.startsWith("/")){
LogDebug() << "Old rpath in" << binaryPath << "starts with /, hence adding it to LD_LIBRARY_PATH";
// FIXME: Split along ":" characters, check each one, only append to LD_LIBRARY_PATH if not already there
QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
QString oldPath = env.value("LD_LIBRARY_PATH");
QString newPath = oldRpath + ":" + oldPath; // FIXME: If we use a ldd replacement, we still need to observe this path
// FIXME: Directory layout might be different for system Qt; cannot assume lib/ to always be inside the Qt directory
LogDebug() << "Added to LD_LIBRARY_PATH:" << newPath;
setenv("LD_LIBRARY_PATH",newPath.toUtf8().constData(),1);
}
LogNormal() << "Changing rpath in" << binaryPath << "to" << id; LogNormal() << "Changing rpath in" << binaryPath << "to" << id;
runPatchelf(QStringList() << "--set-rpath" << id << binaryPath); runPatchelf(QStringList() << "--set-rpath" << id << binaryPath);