Existing relative RPATHs are not removed (probonopd#327)

M-Mueller · Oct 31, 2018 · 6c26010 · 6c26010
1 parent 7749d00
commit 6c26010
Showing 1 changed file with 15 additions and 2 deletions.
diff --git a/tools/linuxdeployqt/shared.cpp b/tools/linuxdeployqt/shared.cpp
@@ -841,8 +841,21 @@ void changeIdentification(const QString &id, const QString &binaryPath)
             setenv("LD_LIBRARY_PATH",newPath.toUtf8().constData(),1);
         }
     }
-    LogNormal() << "Changing rpath in" << binaryPath << "to" << id;
-    runPatchelf(QStringList() << "--set-rpath" << id << binaryPath);
+
+    QStringList rpath = oldRpath.split(":", QString::SkipEmptyParts);
+    rpath.prepend(id);
+    rpath.removeDuplicates();
+    foreach(QString path, QStringList(rpath)) {
+        // remove any non-relative path that would point outside the package
+        if (!path.startsWith("$ORIGIN"))
+        {
+            LogWarning() << "Removing absolute rpath of " << path << " in " << binaryPath;
+            rpath.removeAll(path);
+        }
+    }
+
+    LogNormal() << "Changing rpath in" << binaryPath << "to" << rpath.join(":");
+    runPatchelf(QStringList() << "--set-rpath" << rpath.join(":") << binaryPath);
 
     // qt_prfxpath:
     if (binaryPath.contains("libQt5Core")) {