diff options
Diffstat (limited to '0018-Merge-shared-and-static-library-trees.patch')
| -rw-r--r-- | 0018-Merge-shared-and-static-library-trees.patch | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/0018-Merge-shared-and-static-library-trees.patch b/0018-Merge-shared-and-static-library-trees.patch index 27015bd4d5af..1f2db1e84177 100644 --- a/0018-Merge-shared-and-static-library-trees.patch +++ b/0018-Merge-shared-and-static-library-trees.patch @@ -1,7 +1,7 @@ -From 24a7b52b579fb5f0787d9738668841392c8bd649 Mon Sep 17 00:00:00 2001 +From fbda1fcb3f3bd84852a594f2bf8805db93e27294 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 18:45:08 +0200 -Subject: [PATCH 18/33] Merge shared and static library trees +Subject: [PATCH 18/32] Merge shared and static library trees Allow installation of shared and static build in the same prefix --- @@ -15,10 +15,10 @@ Allow installation of shared and static build in the same prefix 7 files changed, 74 insertions(+), 11 deletions(-) diff --git a/configure.pri b/configure.pri -index 7b8dee0953..5477c264eb 100644 +index 3778ece180..c108b2843c 100644 --- a/configure.pri +++ b/configure.pri -@@ -676,7 +676,12 @@ defineTest(qtConfOutput_machineTuple) { +@@ -652,7 +652,12 @@ defineTest(qtConfOutput_machineTuple) { defineTest(qtConfOutput_commitOptions) { # qdevice.pri needs to be written early, because the compile tests require it. @@ -32,7 +32,7 @@ index 7b8dee0953..5477c264eb 100644 } # type (empty or 'host'), option name, default value -@@ -1369,3 +1374,12 @@ defineTest(createConfigStatus) { +@@ -1342,3 +1347,12 @@ defineTest(createConfigStatus) { QMAKE_POST_CONFIGURE += \ "createConfigStatus()" @@ -137,10 +137,10 @@ index 51ea3a8321..275e080ae4 100644 QMAKE_EXT_YACC = .y diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp -index 8a47d584c3..b158bb9b52 100644 +index 5c6e7e1281..0eeeb5fb5e 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp -@@ -3257,6 +3257,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir) +@@ -3262,6 +3262,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir) if (project->isActiveConfig("debug")) { ret += "d"; } @@ -150,7 +150,7 @@ index 8a47d584c3..b158bb9b52 100644 ret += Option::pkgcfg_ext; QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString(); if(!subdir.isEmpty()) { -@@ -3433,11 +3436,11 @@ MakefileGenerator::writePkgConfigFile() +@@ -3438,11 +3441,11 @@ MakefileGenerator::writePkgConfigFile() t << endl; // requires @@ -202,5 +202,5 @@ index c0ce0972ef..5a2deaf31d 100644 mkspecs.files -= $$PWD/mkspecs/modules $$PWD/mkspecs/modules-inst INSTALLS += mkspecs -- -2.23.0 +2.24.0 |