summarylogtreecommitdiffstats
path: root/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch
diff options
context:
space:
mode:
authorMartchus2019-02-05 21:22:01 +0100
committerMartchus2019-02-05 21:22:01 +0100
commitb09d72afed69584884f0784e2bd58872cc3fa911 (patch)
tree4c6075aa5a6920a20b0fc3a698d0a76ca2e91585 /0030-Prevent-qmake-from-messing-static-lib-dependencies.patch
parent8cb0a8e8891db5cb17bf0225b243a6983519e19e (diff)
downloadaur-b09d72afed69584884f0784e2bd58872cc3fa911.tar.gz
Update to 5.12.1
Diffstat (limited to '0030-Prevent-qmake-from-messing-static-lib-dependencies.patch')
-rw-r--r--0030-Prevent-qmake-from-messing-static-lib-dependencies.patch26
1 files changed, 13 insertions, 13 deletions
diff --git a/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch b/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch
index e6ea0ed9651..cb4dc10dbc7 100644
--- a/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch
+++ b/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch
@@ -1,7 +1,7 @@
-From 496054604431db3e647bf89d63a9140ce75d1001 Mon Sep 17 00:00:00 2001
+From e917a88d58047cdb3fb46c1b07fb78648bf74358 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Tue, 7 Feb 2017 18:25:28 +0100
-Subject: [PATCH 30/33] Prevent qmake from messing static lib dependencies
+Subject: [PATCH 30/34] Prevent qmake from messing static lib dependencies
In particular, it messes resolving cyclic dependency between
static freetype2 and harfbuzz
@@ -11,7 +11,7 @@ static freetype2 and harfbuzz
2 files changed, 6 insertions(+)
diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp
-index 50ec8db79e..50789b3b9c 100644
+index 4cbe06d9dc..47535f60d5 100644
--- a/qmake/generators/unix/unixmake.cpp
+++ b/qmake/generators/unix/unixmake.cpp
@@ -393,6 +393,9 @@ UnixMakefileGenerator::fixLibFlag(const ProString &lib)
@@ -25,19 +25,19 @@ index 50ec8db79e..50789b3b9c 100644
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 59b394ca51..7788862142 100644
+index 4592fed7b2..b93d0df473 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[] = { "LIBS", "LIBS_PRIVATE",
- "QMAKE_LIBS", "QMAKE_LIBS_PRIVATE", nullptr };
+ 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;
+ for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS"))
+ dirs.append(QMakeLocalFileName(dlib.toQString()));
--
2.20.1