aboutsummarylogtreecommitdiffstats
path: root/0007-Prevent-debug-library-names-in-pkg-config-files.patch
diff options
context:
space:
mode:
authorMartchus2017-07-06 23:12:06 +0200
committerMartchus2017-07-06 23:12:06 +0200
commit94def18b2668f9650f74ffec756e176ccc4c4fb3 (patch)
tree2a7162956b1d4db0110b473d82413354264934ea /0007-Prevent-debug-library-names-in-pkg-config-files.patch
parent3df6482af8c916f5105111d1dcf6711e01a56c47 (diff)
downloadaur-94def18b2668f9650f74ffec756e176ccc4c4fb3.tar.gz
Update to 5.9.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.patch8
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 a4fa0df0a988..e34889808291 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 6656828260372d7e2e6256fa85e37a830b58260c Mon Sep 17 00:00:00 2001
+From 46cd5894bb960c5c67e31f372737ae3268924b67 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 14:01:14 +0200
Subject: [PATCH 07/31] 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 fb886e00d2..55e25d596a 100644
+index 0be4b1ef01..c7e075b5bc 100644
--- a/qmake/generators/makefile.cpp
+++ b/qmake/generators/makefile.cpp
-@@ -3166,6 +3166,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
+@@ -3160,6 +3160,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
if (dot != -1)
ret = ret.left(dot);
}
@@ -29,5 +29,5 @@ index fb886e00d2..55e25d596a 100644
QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString();
if(!subdir.isEmpty()) {
--
-2.13.0
+2.13.2