diff options
author | Martchus | 2017-08-09 22:24:26 +0200 |
---|---|---|
committer | Martchus | 2017-08-09 22:24:26 +0200 |
commit | f06a161bf2daa014a475878a7f98ae95a9f7fd9e (patch) | |
tree | e5f1f9908f88e175002d30c223aa1b131c6f2b9a /0005-Prevent-debug-library-names-in-pkg-config-files.patch | |
download | aur-apple-darwin-qt5-base.tar.gz |
Initial import
Diffstat (limited to '0005-Prevent-debug-library-names-in-pkg-config-files.patch')
-rw-r--r-- | 0005-Prevent-debug-library-names-in-pkg-config-files.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/0005-Prevent-debug-library-names-in-pkg-config-files.patch b/0005-Prevent-debug-library-names-in-pkg-config-files.patch new file mode 100644 index 000000000000..f8f94f18baf4 --- /dev/null +++ b/0005-Prevent-debug-library-names-in-pkg-config-files.patch @@ -0,0 +1,33 @@ +From a39d7239989f1efeba81a608ada1a028c3e73c46 Mon Sep 17 00:00:00 2001 +From: Martchus <martchus@gmx.net> +Date: Sun, 18 Sep 2016 14:01:14 +0200 +Subject: [PATCH 5/8] 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 a1f3352aa3..56f0a3b703 100644 +--- a/qmake/generators/makefile.cpp ++++ b/qmake/generators/makefile.cpp +@@ -3160,6 +3160,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify) + 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.13.4 + |