diff options
author | Martchus | 2019-03-26 21:40:14 +0100 |
---|---|---|
committer | Martchus | 2019-03-26 21:40:14 +0100 |
commit | ee405f2d0cd2086bab0db33bd36ea3c069a92133 (patch) | |
tree | ebbe0f3a8acce126b02eb7df556452153e7182dc /0007-Prevent-debug-library-names-in-pkg-config-files.patch | |
parent | b09d72afed69584884f0784e2bd58872cc3fa911 (diff) | |
download | aur-ee405f2d0cd2086bab0db33bd36ea3c069a92133.tar.gz |
Update to 5.12.2
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 bc386a79a343..ae6ecec75c4a 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 a7d2f0dacfb8e30058dcacf34450a467a5ff5d94 Mon Sep 17 00:00:00 2001 +From 5242deeb9bda4e9e692bb56a2cc681d4311cb0e5 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 14:01:14 +0200 Subject: [PATCH 07/34] 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 07abba9e5f..e640fb8079 100644 +index bc466d35b3..67d97f520a 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp -@@ -3241,6 +3241,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir) +@@ -3244,6 +3244,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir) if (dot != -1) ret = ret.left(dot); } @@ -29,5 +29,5 @@ index 07abba9e5f..e640fb8079 100644 QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString(); if(!subdir.isEmpty()) { -- -2.20.1 +2.21.0 |