[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
08/09: gnu: qt-4: Remove reference from "out" to "doc".
From: |
Ludovic Courtès |
Subject: |
08/09: gnu: qt-4: Remove reference from "out" to "doc". |
Date: |
Fri, 03 Jul 2015 13:36:15 +0000 |
civodul pushed a commit to branch master
in repository guix.
commit 4b0f2ef743b47d8eab492151db3ae0541e808854
Author: Ludovic Courtès <address@hidden>
Date: Sat Jun 27 21:37:50 2015 +0200
gnu: qt-4: Remove reference from "out" to "doc".
* gnu/packages/qt.scm (qt-4)[arguments]: Remove '-docdir' configure flag.
Add 'move-doc' phase.
---
gnu/packages/qt.scm | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 0040b5f..208e2ba 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -264,7 +264,9 @@ developers using C++ or QML, a CSS & JavaScript like
language.")
"./configure"
"-verbose"
"-prefix" out
- "-docdir" (string-append doc "/share/doc/qt-" ,version)
+ ;; Note: Don't pass '-docdir' since 'qmake' and
+ ;; libQtCore would record its value, thereby defeating
+ ;; the whole point of having a separate output.
"-datadir" (string-append out "/share/qt-" ,version
"/data")
"-importdir" (string-append out "/lib/qt-4"
@@ -296,7 +298,23 @@ developers using C++ or QML, a CSS & JavaScript like
language.")
"-no-sse4.1"
"-no-sse4.2"
"-no-avx"
- "-no-neon"))))))))))
+ "-no-neon")))))
+ (add-after
+ 'install 'move-doc
+ (lambda* (#:key outputs #:allow-other-keys)
+ ;; Because of qt4-documentation-path.patch, documentation ends up
+ ;; being installed in OUT. Move it to the right place.
+ (let* ((out (assoc-ref outputs "out"))
+ (doc (assoc-ref outputs "doc"))
+ (olddoc (string-append out "/doc"))
+ (docdir (string-append doc "/share/doc/qt-" ,version)))
+ (mkdir-p (dirname docdir))
+
+ ;; Note: We can't use 'rename-file' here because OUT and DOC are
+ ;; different "devices" due to bind-mounts.
+ (copy-recursively olddoc docdir)
+ (delete-file-recursively olddoc)
+ #t))))))))
(define-public python-sip
(package
- branch master updated (4a6aeb6 -> 606c638), Ludovic Courtès, 2015/07/03
- 03/09: gnu: mysql: Strip references and GCC and other build-time dependencies., Ludovic Courtès, 2015/07/03
- 07/09: gnu: qt-4: Use a more standard directory layout., Ludovic Courtès, 2015/07/03
- 09/09: gnu: gnutls: Move man3 pages to "doc" output., Ludovic Courtès, 2015/07/03
- 02/09: gnu: mutt: Don't retain reference to GCC., Ludovic Courtès, 2015/07/03
- 01/09: gnu: ghostscript: Add "doc" output., Ludovic Courtès, 2015/07/03
- 04/09: gnu: mysql: Remove unnecessary binaries., Ludovic Courtès, 2015/07/03
- 06/09: gnu: qt-4: Use 'modify-phases'., Ludovic Courtès, 2015/07/03
- 05/09: gnu: cups-filter: Install backends and filters under lib/cups., Ludovic Courtès, 2015/07/03
- 08/09: gnu: qt-4: Remove reference from "out" to "doc".,
Ludovic Courtès <=