File revert-workaround.patch of Package linuxdeployqt

Overview Repositories Revisions Requests Users Attributes Meta

File revert-workaround.patch of Package linuxdeployqt (Revision 38540b1b951d3ac2c7028e05ba6e697c)

Currently displaying revision 38540b1b951d3ac2c7028e05ba6e697c , Show latest

diff --git a/tools/linuxdeployqt/shared.cpp b/tools/linuxdeployqt/shared.cpp
index b67b11c..c1a410a 100644
--- a/tools/linuxdeployqt/shared.cpp
+++ b/tools/linuxdeployqt/shared.cpp
@@ -901,36 +901,6 @@ void runStrip(const QString &binaryPath)
     // Since we might have a symlink, we need to find its target first
     QString resolvedPath = QFileInfo(binaryPath).canonicalFilePath();
 
-    LogDebug() << "Determining whether to run strip:";
-    LogDebug() << " checking whether" << resolvedPath << "has an rpath set";
-    LogDebug() << "patchelf" << "--print-rpath" << resolvedPath;
-    QProcess patchelfread;
-    patchelfread.start("patchelf", QStringList() << "--print-rpath" << resolvedPath);
-    if (!patchelfread.waitForStarted()) {
-        if(patchelfread.errorString().contains("execvp: No such file or directory")){
-            LogError() << "Could not start patchelf.";
-            LogError() << "Make sure it is installed on your $PATH.";
-        } else {
-            LogError() << "Could not start patchelf. Process error is" << patchelfread.errorString();
-        }
-        // exit(1); // Do not exit because this could be a script that patchelf can't work on
-    }
-    patchelfread.waitForFinished();
-
-    if (patchelfread.exitCode() != 0){
-        LogError() << "Error reading rpath with patchelf" << QFileInfo(resolvedPath).completeBaseName() << ":" << patchelfread.readAllStandardError();
-        LogError() << "Error reading rpath with patchelf" << QFileInfo(resolvedPath).completeBaseName() << ":" << patchelfread.readAllStandardOutput();
-        exit(1);
-    }
-
-    QString rpath = patchelfread.readAllStandardOutput();
-
-    if (rpath.startsWith("$")){
-        LogDebug() << "Already contains rpath starting with $, hence not stripping";
-        LogDebug() << patchelfread.readAllStandardOutput();
-        return;
-    }
-
     LogDebug() << "Using strip:";
     LogDebug() << " stripping" << resolvedPath;
     QProcess strip;
@@ -954,7 +924,6 @@ void runStrip(const QString &binaryPath)
     } else {
         LogError() << "Error stripping" << QFileInfo(resolvedPath).completeBaseName() << ":" << strip.readAllStandardError();
         LogError() << "Error stripping" << QFileInfo(resolvedPath).completeBaseName() << ":" << strip.readAllStandardOutput();
-        exit(1);
     }
 
 }

Places

File revert-workaround.patch of Package linuxdeployqt (Revision 38540b1b951d3ac2c7028e05ba6e697c)

Places