diff options
Diffstat (limited to '0028-Prevent-qmake-from-messing-static-lib-dependencies.patch')
-rw-r--r-- | 0028-Prevent-qmake-from-messing-static-lib-dependencies.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch b/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch new file mode 100644 index 000000000000..9776e1a11cbc --- /dev/null +++ b/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch @@ -0,0 +1,45 @@ +From 2095dda5640e16c678173355a2d39910701d8fc3 Mon Sep 17 00:00:00 2001 +From: Martchus <martchus@gmx.net> +Date: Tue, 7 Feb 2017 18:25:28 +0100 +Subject: [PATCH 28/32] Prevent qmake from messing static lib dependencies + +In particular, it messes resolving cyclic dependency between +static freetype2 and harfbuzz + +Change-Id: Ie5a4e2ad96bd613ae4c26486edb30c74929459b0 +--- + 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 f7bd6dc6634..b76c444012c 100644 +--- a/qmake/generators/unix/unixmake.cpp ++++ b/qmake/generators/unix/unixmake.cpp +@@ -391,6 +391,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 ++ } + QVector<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 03732df4a84..602f7609f58 100644 +--- a/qmake/generators/win32/winmakefile.cpp ++++ b/qmake/generators/win32/winmakefile.cpp +@@ -106,6 +106,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 ++ } + QVector<LibrarySearchPath> dirs; + int libidx = 0; + for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS")) +-- +2.44.0 + |