From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35858) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eABAW-0003bG-Fz for guix-patches@gnu.org; Thu, 02 Nov 2017 04:48:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eABAR-0005Pd-K5 for guix-patches@gnu.org; Thu, 02 Nov 2017 04:48:08 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:38154) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eABAR-0005PV-GH for guix-patches@gnu.org; Thu, 02 Nov 2017 04:48:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1eABAQ-0003Co-2C for guix-patches@gnu.org; Thu, 02 Nov 2017 04:48:03 -0400 Subject: [bug#29114] [PATCH 01/10] gnu: extra-cmake-modules: Install pri-files into lib/qt5/. References: <20171102084625.21306-1-h.goebel@crazy-compilers.com> In-Reply-To: <20171102084625.21306-1-h.goebel@crazy-compilers.com> Resent-Message-ID: From: Hartmut Goebel Date: Thu, 2 Nov 2017 09:47:41 +0100 Message-Id: <20171102084750.21368-1-h.goebel@crazy-compilers.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 29114@debbugs.gnu.org This in accordance with the documentation in ECMGeneratePriFile.cmake: "Packagers … want to set `ECM_MKSPECS_INSTALL_DIR` to something like `share/qt5/mkspecs/modules`." Our Qt5 is putting pri-files into `lib/qt5/mkspecs/modules`. * gnu/packages/kde-frameworks.scm(extra-cmake-modules)[#:phase fix-lib-path]: New substitute for file 'modules/ECMGeneratePriFile.cmake'. --- gnu/packages/kde-frameworks.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 6a46f2868..59022f3f0 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -104,7 +104,11 @@ "_define_relative(QTQUICKIMPORTSDIR LIBDIR \"qt5/imports\"") ;; Install qml-files into lib/qt5/qml (("_define_relative\\(QMLDIR LIBDIR \"qml\"") - "_define_relative(QMLDIR LIBDIR \"qt5/qml\"")))) + "_define_relative(QMLDIR LIBDIR \"qt5/qml\"")) + (substitute* "modules/ECMGeneratePriFile.cmake" + ;; Install pri-files into lib/qt5/mkspecs + (("set\\(ECM_MKSPECS_INSTALL_DIR mkspecs/modules") + "set(ECM_MKSPECS_INSTALL_DIR lib/qt5/mkspecs/modules")))) ;; install and check phase are swapped to prevent install from failing ;; after testsuire has run (add-after 'install 'check-post-install -- 2.13.5