diff options
Diffstat (limited to '0022-Merge-shared-and-static-library-trees.patch')
| -rw-r--r-- | 0022-Merge-shared-and-static-library-trees.patch | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/0022-Merge-shared-and-static-library-trees.patch b/0022-Merge-shared-and-static-library-trees.patch index 6904e4e61cc5..c2c02d585df6 100644 --- a/0022-Merge-shared-and-static-library-trees.patch +++ b/0022-Merge-shared-and-static-library-trees.patch @@ -1,22 +1,22 @@ -From aacc349ec8e9241ff95678d9730d71805289256b Mon Sep 17 00:00:00 2001 +From 0401a8dd7051a1d6aca6288fd5a5d0bef006168e Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 18:45:08 +0200 -Subject: [PATCH 22/31] Merge shared and static library trees +Subject: [PATCH 22/33] Merge shared and static library trees Allow installation of shared and static build in the same prefix --- - configure.pri | 7 +++++++ + configure.pri | 9 +++++++++ mkspecs/features/default_post.prf | 11 +++++++++++ mkspecs/features/qt.prf | 15 +++++++++++++++ mkspecs/features/spec_pre.prf | 11 ++++++++--- qmake/generators/makefile.cpp | 9 ++++++--- - 5 files changed, 47 insertions(+), 6 deletions(-) + 5 files changed, 49 insertions(+), 6 deletions(-) diff --git a/configure.pri b/configure.pri -index 76bb27e4ae..7dd19be845 100644 +index 83c0dee141..a05c3d98e6 100644 --- a/configure.pri +++ b/configure.pri -@@ -1212,3 +1212,10 @@ defineTest(createConfigStatus) { +@@ -1212,3 +1212,12 @@ defineTest(createConfigStatus) { QMAKE_POST_CONFIGURE += \ "createConfigStatus()" @@ -26,6 +26,8 @@ index 76bb27e4ae..7dd19be845 100644 + CONFIG -= shared + QT_CONFIG += static jpeg gif + QT_CONFIG -= shared ++ # prevent smart library merge from messing cyclic dependency between freetype2 and harfbuzz ++ CONFIG += no_smart_library_merge +} diff --git a/mkspecs/features/default_post.prf b/mkspecs/features/default_post.prf index 7e027325bd..ad0db62b78 100644 @@ -124,5 +126,5 @@ index c7e075b5bc..d61f7b05e5 100644 t << endl; -- -2.13.2 +2.14.2 |