Add option to avoid redundant copy of libraries (probonopd#327)

Author: M-Mueller

README.md

@@ -36,6 +36,8 @@ Options:
    -extra-plugins=<list>    : List of extra plugins which should be deployed,
                               separated by comma.
    -no-copy-copyright-files : Skip deployment of copyright files.
+   -no-copy-packaged-libs   : Don't copy libraries that are already contained in
+                              the package (e.g. in a subdirectory)
    -no-plugins              : Skip plugin deployment.
    -no-strip                : Don't run 'strip' on the binaries.
    -no-translations         : Skip deployment of translations.

tools/linuxdeployqt/main.cpp

@@ -84,6 +84,8 @@ int main(int argc, char **argv)
         qInfo() << "   -extra-plugins=<list>    : List of extra plugins which should be deployed,";
         qInfo() << "                              separated by comma.";
         qInfo() << "   -no-copy-copyright-files : Skip deployment of copyright files.";
+        qInfo() << "   -no-copy-packaged-libs   : Don't copy libraries that are already contained in";
+        qInfo() << "                              the package (e.g. in a subdirectory)";
         qInfo() << "   -no-plugins              : Skip plugin deployment.";
         qInfo() << "   -no-strip                : Don't run 'strip' on the binaries.";
         qInfo() << "   -no-translations         : Skip deployment of translations.";
@@ -222,6 +224,7 @@ int main(int argc, char **argv)
     extern QStringList excludeLibs;
     extern QStringList ignoreGlob;
     extern bool copyCopyrightFiles;
+    extern bool copyPackagedLibs;
 
     /* FHS-like mode is for an application that has been installed to a $PREFIX which is otherwise empty, e.g., /path/to/usr.
      * In this case, we want to construct an AppDir in /path/to. */
@@ -425,6 +428,9 @@ int main(int argc, char **argv)
         } else if (argument.startsWith("-no-copy-copyright-files")) {
             LogDebug() << "Argument found:" << argument;
             copyCopyrightFiles = false;
+        } else if (argument.startsWith("-no-copy-packaged-libs")) {
+            LogDebug() << "Argument found:" << argument;
+            copyPackagedLibs = false;
         } else if (argument == QByteArray("-always-overwrite")) {
             LogDebug() << "Argument found:" << argument;
             alwaysOwerwriteEnabled = true;

tools/linuxdeployqt/shared.cpp

@@ -62,6 +62,7 @@ QStringList extraQtPlugins;
 QStringList excludeLibs;
 QStringList ignoreGlob;
 bool copyCopyrightFiles = true;
+bool copyPackagedLibs = true;
 
 using std::cout;
 using std::endl;
@@ -520,7 +521,11 @@ LibraryInfo parseLddLibraryLine(const QString &line, const QString &appDirPath,
             info.deployedInstallName = "$ORIGIN"; // + info.binaryName;
             info.libraryPath = info.libraryDirectory + info.binaryName;
             info.sourceFilePath = info.libraryPath;
-            info.libraryDestinationDirectory = bundleLibraryDirectory + "/";
+            if (!copyPackagedLibs && info.libraryPath.contains(appDirPath))
+                // leave libs that are already in the appdir in their current location
+                info.libraryDestinationDirectory = QDir(appDirPath).relativeFilePath(info.libraryDirectory);
+            else
+                info.libraryDestinationDirectory = bundleLibraryDirectory + "/";
             info.binaryDestinationDirectory = info.libraryDestinationDirectory;
             info.binaryDirectory = info.libraryDirectory;
             info.binaryPath = info.libraryPath;