summarylogtreecommitdiffstats
path: root/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch
diff options
context:
space:
mode:
authorMartchus2019-06-26 14:41:33 +0200
committerMartchus2019-06-26 14:41:33 +0200
commit7e9790ef70cdbf8552595445b938883ba09b475b (patch)
tree54f43d30ddceeb2d28776b5e9966044aab7f7f81 /0030-Prevent-qmake-from-messing-static-lib-dependencies.patch
parent748a3f030424dc491a60d5166204dee722f9cbb6 (diff)
downloadaur-7e9790ef70cdbf8552595445b938883ba09b475b.tar.gz
Update to 5.13.0
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, 0 insertions, 43 deletions
diff --git a/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch b/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch
deleted file mode 100644
index 7d3b41d270d..00000000000
--- a/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 70d1ba494a9d2498ca79dab847cb8d4b6598bdc1 Mon Sep 17 00:00:00 2001
-From: Martchus <martchus@gmx.net>
-Date: Tue, 7 Feb 2017 18:25:28 +0100
-Subject: [PATCH 30/34] 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 7f42fbe09e..e27428c0f2 100644
---- a/qmake/generators/unix/unixmake.cpp
-+++ b/qmake/generators/unix/unixmake.cpp
-@@ -393,6 +393,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 29bf9441f7..cc4c031ce7 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;
- int libidx = 0;
- for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS"))
---
-2.21.0
-