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

Bundle libicu*

Browse Source
This commit is contained in:
probonopd
2016-09-09 02:10:33 +02:00
committed by GitHub
parent 29b1934f9a
commit 117b176215
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shared/shared.cpp
+6 -1
View File
@@ -199,8 +199,13 @@ LibraryInfo parseLddLibraryLine(const QString &line, const QString &appDirPath,
// Don't deploy low-level libraries in /usr or /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 // 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 // use something like patchelf --set-interpreter or http://bitwagon.com/rtldi/rtldi.html
if ((trimmed.startsWith("/usr") or (trimmed.startsWith("/lib")))) // With the Qt provided by qt.io the libicu libraries come bundled, but that is not the case with e.g.,
// Qt from ppas. Hence we make sure libicu is always bundled since it cannot be assumed to be on target sytems
if not (trimmed.contains("libicu")) {
if ((trimmed.startsWith("/usr") or (trimmed.startsWith("/lib")))) {
return info; return info;
}
}
enum State {QtPath, LibraryName, Version, End}; enum State {QtPath, LibraryName, Version, End};
State state = QtPath; State state = QtPath;