summarylogtreecommitdiffstats
path: root/0021-Merge-shared-and-static-library-trees.patch
diff options
context:
space:
mode:
authorMartchus2019-02-05 21:22:01 +0100
committerMartchus2019-02-05 21:22:01 +0100
commitb09d72afed69584884f0784e2bd58872cc3fa911 (patch)
tree4c6075aa5a6920a20b0fc3a698d0a76ca2e91585 /0021-Merge-shared-and-static-library-trees.patch
parent8cb0a8e8891db5cb17bf0225b243a6983519e19e (diff)
downloadaur-b09d72afed69584884f0784e2bd58872cc3fa911.tar.gz
Update to 5.12.1
Diffstat (limited to '0021-Merge-shared-and-static-library-trees.patch')
-rw-r--r--0021-Merge-shared-and-static-library-trees.patch16
1 files changed, 8 insertions, 8 deletions
diff --git a/0021-Merge-shared-and-static-library-trees.patch b/0021-Merge-shared-and-static-library-trees.patch
index a4e446dde42..142e2cebba3 100644
--- a/0021-Merge-shared-and-static-library-trees.patch
+++ b/0021-Merge-shared-and-static-library-trees.patch
@@ -1,7 +1,7 @@
-From c14a296d3385a7d2aafbe793c7c1e49aa48d1b66 Mon Sep 17 00:00:00 2001
+From d21a2fde18007e8abbde3407ae20b967b137069e Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:45:08 +0200
-Subject: [PATCH 21/33] Merge shared and static library trees
+Subject: [PATCH 21/34] Merge shared and static library trees
Allow installation of shared and static build in the same prefix
---
@@ -13,7 +13,7 @@ Allow installation of shared and static build in the same prefix
5 files changed, 51 insertions(+), 6 deletions(-)
diff --git a/configure.pri b/configure.pri
-index 64ed6b9ed8..2cc54d15a2 100644
+index b3b3e27c44..3136889a2f 100644
--- a/configure.pri
+++ b/configure.pri
@@ -1312,3 +1312,12 @@ defineTest(createConfigStatus) {
@@ -51,10 +51,10 @@ index fbf1f3b8df..c261c46e72 100644
!have_target:!force_qt: CONFIG -= qt
diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
-index d16b3cf1be..2c4d6cd97e 100644
+index 5da82fdb5b..5b05aa9e2a 100644
--- a/mkspecs/features/qt.prf
+++ b/mkspecs/features/qt.prf
-@@ -268,6 +268,23 @@ for(ever) {
+@@ -246,6 +246,23 @@ for(ever) {
!isEmpty(MODULE_WINRT_CAPABILITIES_DEVICE): \
WINRT_MANIFEST.capabilities_device_default += $$MODULE_WINRT_CAPABILITIES_DEVICE
}
@@ -101,10 +101,10 @@ index 51ea3a8321..275e080ae4 100644
QMAKE_EXT_YACC = .y
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
-index a7f1285c26..879410afef 100644
+index e640fb8079..fc7f729ae6 100644
--- a/qmake/generators/makefile.cpp
+++ b/qmake/generators/makefile.cpp
-@@ -3206,6 +3206,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
+@@ -3244,6 +3244,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
if (project->isActiveConfig("debug")) {
ret += "d";
}
@@ -114,7 +114,7 @@ index a7f1285c26..879410afef 100644
ret += Option::pkgcfg_ext;
QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString();
if(!subdir.isEmpty()) {
-@@ -3380,9 +3383,9 @@ MakefileGenerator::writePkgConfigFile()
+@@ -3418,9 +3421,9 @@ MakefileGenerator::writePkgConfigFile()
t << endl;
// requires