diff options
Diffstat (limited to '0004-Make-sure-.pc-files-are-installed-correctly.patch')
-rw-r--r-- | 0004-Make-sure-.pc-files-are-installed-correctly.patch | 66 |
1 files changed, 66 insertions, 0 deletions
diff --git a/0004-Make-sure-.pc-files-are-installed-correctly.patch b/0004-Make-sure-.pc-files-are-installed-correctly.patch new file mode 100644 index 000000000000..7a73127b2895 --- /dev/null +++ b/0004-Make-sure-.pc-files-are-installed-correctly.patch @@ -0,0 +1,66 @@ +From 3887b9693805365272de6101eab5c332862960e3 Mon Sep 17 00:00:00 2001 +From: Martchus <martchus@gmx.net> +Date: Sun, 18 Sep 2016 13:54:12 +0200 +Subject: [PATCH 04/33] Make sure *.pc files are installed correctly + +--- + qmake/generators/makefile.cpp | 8 ++++++-- + qmake/generators/makefile.h | 2 +- + qmake/generators/win32/winmakefile.cpp | 2 +- + 3 files changed, 8 insertions(+), 4 deletions(-) + +diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp +index b634ec622b..aac53cd0ea 100644 +--- a/qmake/generators/makefile.cpp ++++ b/qmake/generators/makefile.cpp +@@ -3230,7 +3230,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const + } + + QString +-MakefileGenerator::pkgConfigFileName(bool fixify) ++MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir) + { + QString ret = project->first("QMAKE_PKGCONFIG_FILE").toQString(); + if (ret.isEmpty()) { +@@ -3255,7 +3255,11 @@ MakefileGenerator::pkgConfigFileName(bool fixify) + if(fixify) { + if(QDir::isRelativePath(ret) && !project->isEmpty("DESTDIR")) + ret.prepend(project->first("DESTDIR").toQString()); +- ret = fileFixify(ret, FileFixifyBackwards); ++ if (onlyPrependDestdir) { ++ ret = Option::fixPathToLocalOS(ret); ++ } else { ++ ret = fileFixify(ret, FileFixifyBackwards); ++ } + } + return ret; + } +diff --git a/qmake/generators/makefile.h b/qmake/generators/makefile.h +index 350ebd377a..d0c234b864 100644 +--- a/qmake/generators/makefile.h ++++ b/qmake/generators/makefile.h +@@ -92,7 +92,7 @@ protected: + virtual void writeDefaultVariables(QTextStream &t); + + QString pkgConfigPrefix() const; +- QString pkgConfigFileName(bool fixify=true); ++ QString pkgConfigFileName(bool fixify=true, bool onlyPrependDestdir = false); + QString pkgConfigFixPath(QString) const; + void writePkgConfigFile(); // for pkg-config + +diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp +index 16f9361d13..d9887cd36d 100644 +--- a/qmake/generators/win32/winmakefile.cpp ++++ b/qmake/generators/win32/winmakefile.cpp +@@ -753,7 +753,7 @@ QString Win32MakefileGenerator::defaultInstall(const QString &t) + } + if(!ret.isEmpty()) + ret += "\n\t"; +- ret += installMetaFile(ProKey("QMAKE_PKGCONFIG_INSTALL_REPLACE"), pkgConfigFileName(true), dst_pc); ++ ret += installMetaFile(ProKey("QMAKE_PKGCONFIG_INSTALL_REPLACE"), pkgConfigFileName(true, true), dst_pc); + if(!uninst.isEmpty()) + uninst.append("\n\t"); + uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc)); +-- +2.22.0 + |