GNU bug report logs - #29087
[PATCH] gnu: extra-cmake-modules: Install pri-files into lib/qt5/.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 29087 in the body.
You can then email your comments to 29087 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Hartmut Goebel <h.goebel <at> crazy-compilers.com>
To: guix-patches <at> gnu.org
Cc: iyzsong <at> member.fsf.org
Subject: [PATCH] gnu: extra-cmake-modules: Install pri-files into lib/qt5/.
Date: Tue, 31 Oct 2017 18:25:51 +0100

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 c92e92ef3..d347ea1d9 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

Message #10 received at 29087-close <at> debbugs.gnu.org (full text, mbox):

From: Hartmut Goebel <h.goebel <at> crazy-compilers.com>
To: 29087-close <at> debbugs.gnu.org
Subject: Re: bug#29087: Acknowledgement ([PATCH] gnu: extra-cmake-modules:
 Install pri-files into lib/qt5/.)
Date: Sun, 5 Nov 2017 11:02:46 +0100

Duplicate, see https://debbugs.gnu.org/cgi/bugreport.cgi?bug=29114#8

-- 
Regards
Hartmut Goebel

| Hartmut Goebel          | h.goebel <at> crazy-compilers.com               |
| www.crazy-compilers.com | compilers which you thought are impossible |

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.