summarylogtreecommitdiffstats
path: root/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch
diff options
context:
space:
mode:
authorMartchus2018-02-19 20:15:10 +0100
committerMartchus2018-02-19 20:15:10 +0100
commit5522f822fc1124b7feaa9b9ed1e958a5f8897a9c (patch)
tree11fbed461c6eca212430a79d08717839068639ab /0030-Prevent-qmake-from-messing-static-lib-dependencies.patch
parent1751d519b0c806f9f02de34dc13faf1b74fd552c (diff)
downloadaur-5522f822fc1124b7feaa9b9ed1e958a5f8897a9c.tar.gz
Update to 5.10.1
Diffstat (limited to '0030-Prevent-qmake-from-messing-static-lib-dependencies.patch')
-rw-r--r--0030-Prevent-qmake-from-messing-static-lib-dependencies.patch43
1 files changed, 43 insertions, 0 deletions
diff --git a/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch b/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch
new file mode 100644
index 00000000000..33aee858ed8
--- /dev/null
+++ b/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch
@@ -0,0 +1,43 @@
+From 8f96fb6b8b9ebeb7643cbab4420bef214b617aae Mon Sep 17 00:00:00 2001
+From: Martchus <martchus@gmx.net>
+Date: Tue, 7 Feb 2017 18:25:28 +0100
+Subject: [PATCH 30/32] Prevent qmake from messing static lib dependencies
+
+In particular, it messes resolving cyclic dependency between
+static freetype2 and harfbuzz
+---
+ qmake/generators/unix/unixmake.cpp | 3 +++
+ qmake/generators/win32/winmakefile.cpp | 3 +++
+ 2 files changed, 6 insertions(+)
+
+diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp
+index 30f99174f8..154edd67d4 100644
+--- a/qmake/generators/unix/unixmake.cpp
++++ b/qmake/generators/unix/unixmake.cpp
+@@ -414,6 +414,9 @@ UnixMakefileGenerator::fixLibFlag(const ProString &lib)
+ bool
+ UnixMakefileGenerator::findLibraries(bool linkPrl, bool mergeLflags)
+ {
++ if(project->isActiveConfig("staticlib")) {
++ return false; // prevent qmake from messing static lib dependencies
++ }
+ QList<QMakeLocalFileName> libdirs, frameworkdirs;
+ int libidx = 0, fwidx = 0;
+ for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS"))
+diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp
+index 2e6d5d94a9..a8320bae09 100644
+--- a/qmake/generators/win32/winmakefile.cpp
++++ b/qmake/generators/win32/winmakefile.cpp
+@@ -87,6 +87,9 @@ Win32MakefileGenerator::findLibraries(bool linkPrl, bool mergeLflags)
+ impexts.append(project->values("QMAKE_EXTENSION_IMPORTLIB"));
+ impexts.append(project->values("QMAKE_EXTENSION_STATICLIB"));
+ }
++ if(project->isActiveConfig("staticlib")) {
++ return false; // prevent qmake from messing static lib dependencies
++ }
+ QList<QMakeLocalFileName> dirs;
+ static const char * const lflags[] = { "QMAKE_LIBS", "QMAKE_LIBS_PRIVATE", 0 };
+ for (int i = 0; lflags[i]; i++) {
+--
+2.16.1
+