diff options
Diffstat (limited to '0030-Prevent-qmake-from-messing-static-lib-dependencies.patch')
| -rw-r--r-- | 0030-Prevent-qmake-from-messing-static-lib-dependencies.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch b/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch index cefd4b32e7c6..2509ae16306a 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 cf89985a2417df8e4519cab3824b239269792e57 Mon Sep 17 00:00:00 2001 +From 9ef6d62307288a6a1656aee01835b4c368678e55 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Tue, 7 Feb 2017 18:25:28 +0100 -Subject: [PATCH 30/30] Prevent qmake from messing static lib dependencies +Subject: [PATCH 30/31] Prevent qmake from messing static lib dependencies In particular, it messes resolving cyclic dependency between static freetype2 and harfbuzz @@ -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 349dcd2f40..f6d3d1fa29 100644 +index 20318f120c..d113216f55 100644 --- a/qmake/generators/unix/unixmake.cpp +++ b/qmake/generators/unix/unixmake.cpp -@@ -394,6 +394,9 @@ UnixMakefileGenerator::fixLibFlag(const ProString &lib) +@@ -410,6 +410,9 @@ UnixMakefileGenerator::fixLibFlag(const ProString &lib) bool UnixMakefileGenerator::findLibraries(bool linkPrl, bool mergeLflags) { @@ -25,7 +25,7 @@ index 349dcd2f40..f6d3d1fa29 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 e6338546bb..2407d26a5a 100644 +index d9388e8518..090c576bc6 100644 --- a/qmake/generators/win32/winmakefile.cpp +++ b/qmake/generators/win32/winmakefile.cpp @@ -87,6 +87,9 @@ Win32MakefileGenerator::findLibraries(bool linkPrl, bool mergeLflags) @@ -39,5 +39,5 @@ index e6338546bb..2407d26a5a 100644 static const char * const lflags[] = { "QMAKE_LIBS", "QMAKE_LIBS_PRIVATE", 0 }; for (int i = 0; lflags[i]; i++) { -- -2.12.1 +2.13.0 |