diff options
| author | Martchus | 2019-04-23 17:30:12 +0200 |
|---|---|---|
| committer | Martchus | 2019-04-23 17:30:12 +0200 |
| commit | 592ce967dc76aeac622a3b194aa2705287fe9ac7 (patch) | |
| tree | 1b6623e8afa9346149f5769ecc9740e155425b49 /0021-Merge-shared-and-static-library-trees.patch | |
| parent | ee405f2d0cd2086bab0db33bd36ea3c069a92133 (diff) | |
| download | aur-592ce967dc76aeac622a3b194aa2705287fe9ac7.tar.gz | |
Update to 5.12.3
Diffstat (limited to '0021-Merge-shared-and-static-library-trees.patch')
| -rw-r--r-- | 0021-Merge-shared-and-static-library-trees.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/0021-Merge-shared-and-static-library-trees.patch b/0021-Merge-shared-and-static-library-trees.patch index 82176cd2cbc1..dbec06bb7854 100644 --- a/0021-Merge-shared-and-static-library-trees.patch +++ b/0021-Merge-shared-and-static-library-trees.patch @@ -1,4 +1,4 @@ -From 0e8a2cab1c1a9257ad85cfa3869433c9b454f860 Mon Sep 17 00:00:00 2001 +From 814b3a23dd94818101265df95b1051987faf440d Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 18:45:08 +0200 Subject: [PATCH 21/34] Merge shared and static library trees @@ -13,10 +13,10 @@ 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 629ca78ff1..b4822af13f 100644 +index 131aa868c2..75203c4572 100644 --- a/configure.pri +++ b/configure.pri -@@ -1315,3 +1315,12 @@ defineTest(createConfigStatus) { +@@ -1318,3 +1318,12 @@ defineTest(createConfigStatus) { QMAKE_POST_CONFIGURE += \ "createConfigStatus()" @@ -101,7 +101,7 @@ index 51ea3a8321..275e080ae4 100644 QMAKE_EXT_YACC = .y diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp -index 67d97f520a..a802c645c7 100644 +index b005da931e..e0c42131f8 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -3247,6 +3247,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir) |