unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
* [bug#29087] [PATCH] gnu: extra-cmake-modules: Install pri-files into lib/qt5/.
@ 2017-10-31 17:25 Hartmut Goebel
       [not found] ` <handler.29087.B.150947076630990.ack@debbugs.gnu.org>
  0 siblings, 1 reply; 2+ messages in thread
From: Hartmut Goebel @ 2017-10-31 17:25 UTC (permalink / raw)
  To: 29087

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

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* bug#29087: Acknowledgement ([PATCH] gnu: extra-cmake-modules: Install pri-files into lib/qt5/.)
       [not found] ` <handler.29087.B.150947076630990.ack@debbugs.gnu.org>
@ 2017-11-05 10:02   ` Hartmut Goebel
  0 siblings, 0 replies; 2+ messages in thread
From: Hartmut Goebel @ 2017-11-05 10:02 UTC (permalink / raw)
  To: 29087-close

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

-- 
Regards
Hartmut Goebel

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

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2017-11-05 10:03 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-10-31 17:25 [bug#29087] [PATCH] gnu: extra-cmake-modules: Install pri-files into lib/qt5/ Hartmut Goebel
     [not found] ` <handler.29087.B.150947076630990.ack@debbugs.gnu.org>
2017-11-05 10:02   ` bug#29087: Acknowledgement ([PATCH] gnu: extra-cmake-modules: Install pri-files into lib/qt5/.) Hartmut Goebel

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).