aboutsummarylogtreecommitdiffstats
path: root/0007-Prevent-debug-library-names-in-pkg-config-files.patch
diff options
context:
space:
mode:
authorMartchus2019-06-26 14:41:36 +0200
committerMartchus2019-06-26 14:41:36 +0200
commitf817cbcc8c47496a5967fa06c162cddfa98f386a (patch)
tree62a3008a3b3ebe67f5007c5f46ed48b85ea5c383 /0007-Prevent-debug-library-names-in-pkg-config-files.patch
parent7cd2ce36c60bf5e1ad40f9af6ef97c9c539d345c (diff)
downloadaur-f817cbcc8c47496a5967fa06c162cddfa98f386a.tar.gz
Update to 5.13.0
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.patch33
1 files changed, 0 insertions, 33 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
deleted file mode 100644
index 962201fcdae9..000000000000
--- a/0007-Prevent-debug-library-names-in-pkg-config-files.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 185e54d2c46014b51579261068b14f1483ba3aa1 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
-
-qmake generates the pkgconfig .pc files two times, once for the
-release build and once for the debug build (which we're not actually
-building in this package). For both generations the exact same
-pkgconfig file name is used. This causes references to the debug
-build ending up in the .pc files which are unwanted
-Prevent this from happening by giving the pkgconfig .pc
-files for the debug build an unique file name.
----
- qmake/generators/makefile.cpp | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
-index aa4c96be49..b005da931e 100644
---- a/qmake/generators/makefile.cpp
-+++ b/qmake/generators/makefile.cpp
-@@ -3244,6 +3244,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
- if (dot != -1)
- ret = ret.left(dot);
- }
-+ if (project->isActiveConfig("debug")) {
-+ ret += "d";
-+ }
- ret += Option::pkgcfg_ext;
- QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString();
- if(!subdir.isEmpty()) {
---
-2.21.0
-