diff options
| author | Martchus | 2018-06-25 14:47:45 +0200 |
|---|---|---|
| committer | Martchus | 2018-06-25 14:47:45 +0200 |
| commit | 47d3c78d9382f51be60b00b27c7f023e073a3635 (patch) | |
| tree | 83bc729b1202813f495539e9a1e8e0c7652fdc6b /0007-Prevent-debug-library-names-in-pkg-config-files.patch | |
| parent | 1de5b17c1169b308c3a014303dc8217228b90cca (diff) | |
| download | aur-47d3c78d9382f51be60b00b27c7f023e073a3635.tar.gz | |
Update to 5.11.1
Diffstat (limited to '0007-Prevent-debug-library-names-in-pkg-config-files.patch')
| -rw-r--r-- | 0007-Prevent-debug-library-names-in-pkg-config-files.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/0007-Prevent-debug-library-names-in-pkg-config-files.patch b/0007-Prevent-debug-library-names-in-pkg-config-files.patch index 8cd33a821bc7..d15f39fbba4b 100644 --- a/0007-Prevent-debug-library-names-in-pkg-config-files.patch +++ b/0007-Prevent-debug-library-names-in-pkg-config-files.patch @@ -1,4 +1,4 @@ -From 4beab05117f21513f0e400c94c9b3d31db25fec0 Mon Sep 17 00:00:00 2001 +From 31cca3a47eea50156a5549574d934dd0264cb0f3 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 14:01:14 +0200 Subject: [PATCH 07/33] Prevent debug library names in pkg-config files @@ -15,10 +15,10 @@ files for the debug build an unique file name. 1 file changed, 3 insertions(+) diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp -index b9871ff49c..0d07d6c333 100644 +index 6c614fd868..bd87c5bd6d 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp -@@ -3160,6 +3160,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir) +@@ -3164,6 +3164,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir) if (dot != -1) ret = ret.left(dot); } @@ -29,5 +29,5 @@ index b9871ff49c..0d07d6c333 100644 QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString(); if(!subdir.isEmpty()) { -- -2.17.0 +2.18.0 |