From dc665c69e30cc27f746bf0c304db8278afe9dbfe Mon Sep 17 00:00:00 2001 From: probonopd Date: Thu, 8 Sep 2016 15:29:37 +0200 Subject: [PATCH] Do not bundle libraries from /usr --- shared/shared.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/shared/shared.cpp b/shared/shared.cpp index 116cb05..e611662 100644 --- a/shared/shared.cpp +++ b/shared/shared.cpp @@ -191,10 +191,10 @@ LibraryInfo parseLddLibraryLine(const QString &line, const QString &appDirPath, if (trimmed.isEmpty()) return info; - // Don't deploy low-level libraries in /lib because these tend to break if moved to a system with a different glibc. + // Don't deploy low-level libraries in /usr or /lib because these tend to break if moved to a system with a different glibc. // TODO: Could make bundling these low-level libraries optional but then the bundles might need to // use something like patchelf --set-interpreter or http://bitwagon.com/rtldi/rtldi.html - if (trimmed.startsWith("/lib")) + if ((trimmed.startsWith("/usr") or (trimmed.startsWith("/lib")))) return info; enum State {QtPath, LibraryName, Version, End};