summarylogtreecommitdiffstats
path: root/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch
diff options
context:
space:
mode:
authorMartchus2018-12-11 18:56:57 +0000
committerMartchus2018-12-11 18:56:57 +0000
commitf835d8ffaedccfa55c5545559c505caf698f62e2 (patch)
tree5b20d43d9d1a17b5cf70ab9e10196cc3deb7ef90 /0030-Prevent-qmake-from-messing-static-lib-dependencies.patch
parentc1312e3ce7592b30f5454345d5ae8a61302b8ef3 (diff)
downloadaur-f835d8ffaedccfa55c5545559c505caf698f62e2.tar.gz
Update to 5.12.0
Diffstat (limited to '0030-Prevent-qmake-from-messing-static-lib-dependencies.patch')
-rw-r--r--0030-Prevent-qmake-from-messing-static-lib-dependencies.patch14
1 files changed, 7 insertions, 7 deletions
diff --git a/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch b/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch
index 064dec5e418..39fc6b291b7 100644
--- a/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch
+++ b/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch
@@ -1,4 +1,4 @@
-From c4f29e97fd87f1f6790708d21247dd6c333167c9 Mon Sep 17 00:00:00 2001
+From f14f1928ace664034aeac5d348883a93f35b2ea5 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
@@ -11,10 +11,10 @@ static freetype2 and harfbuzz
2 files changed, 6 insertions(+)
diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp
-index 894020d2bd..5f57d6f5cb 100644
+index 50ec8db79e..50789b3b9c 100644
--- a/qmake/generators/unix/unixmake.cpp
+++ b/qmake/generators/unix/unixmake.cpp
-@@ -414,6 +414,9 @@ UnixMakefileGenerator::fixLibFlag(const ProString &lib)
+@@ -393,6 +393,9 @@ UnixMakefileGenerator::fixLibFlag(const ProString &lib)
bool
UnixMakefileGenerator::findLibraries(bool linkPrl, bool mergeLflags)
{
@@ -25,7 +25,7 @@ index 894020d2bd..5f57d6f5cb 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 cd64cb0c4f..c63d8b5754 100644
+index 59b394ca51..7788862142 100644
--- a/qmake/generators/win32/winmakefile.cpp
+++ b/qmake/generators/win32/winmakefile.cpp
@@ -87,6 +87,9 @@ Win32MakefileGenerator::findLibraries(bool linkPrl, bool mergeLflags)
@@ -36,8 +36,8 @@ index cd64cb0c4f..c63d8b5754 100644
+ 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++) {
+ static const char * const lflags[] = { "LIBS", "LIBS_PRIVATE",
+ "QMAKE_LIBS", "QMAKE_LIBS_PRIVATE", nullptr };
--
-2.19.0
+2.19.2