nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: Remove a bunch of now unneeded '--mandir' configure flags. 

This has become redundant with the 'validate-documentation-location'
phase introduced in commit d68fe74.

* gnu/packages/compression.scm (bzip2): Remove 'fix-man-dir' phase.
* gnu/packages/ncurses.scm (ncurses)[arguments]: Remove --mandir.
* gnu/packages/pth.scm (pth)[arguments]: Remove #:configure-flags.
* gnu/packages/tcl.scm (tcl)[arguments]: Likewise.
* gnu/packages/xiph.scm (flac)[arguments]: Likewise.
This commit is contained in:
Ludovic Courtès 2015-01-04 22:23:48 +01:00
parent d8491ba563
commit 9b1bf33081
5 changed files with 12 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
gnu/packages/compression.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013, 2014 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2014 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
;;; ;;;
@ -115,13 +115,7 @@ file; as a result, it is often used in conjunction with \"tar\", resulting in
(home-page "http://www.gnu.org/software/gzip/"))) (home-page "http://www.gnu.org/software/gzip/")))
(define-public bzip2 (define-public bzip2
(let ((fix-man-dir (let ((build-shared-lib
;; Move man pages to $out/share/.
'(lambda* (#:key outputs #:allow-other-keys)
(with-directory-excursion (assoc-ref outputs "out")
(mkdir "share")
(rename-file "man" "share/man"))))
(build-shared-lib
;; Build a shared library. ;; Build a shared library.
'(lambda* (#:key inputs #:allow-other-keys) '(lambda* (#:key inputs #:allow-other-keys)
(patch-makefile-SHELL "Makefile-libbz2_so") (patch-makefile-SHELL "Makefile-libbz2_so")
@ -171,20 +165,16 @@ file; as a result, it is often used in conjunction with \"tar\", resulting in
`(alist-cons-before `(alist-cons-before
'build 'build-shared-lib ,build-shared-lib 'build 'build-shared-lib ,build-shared-lib
(alist-cons-after (alist-cons-after
'install 'fix-man-dir ,fix-man-dir 'install 'install-shared-lib ,install-shared-lib
(alist-cons-after (alist-replace 'configure ,set-cross-environment
'install 'install-shared-lib ,install-shared-lib %standard-phases)))
(alist-replace 'configure ,set-cross-environment
%standard-phases))))
;; Native compilation: build the shared library. ;; Native compilation: build the shared library.
`(alist-cons-before `(alist-cons-before
'build 'build-shared-lib ,build-shared-lib 'build 'build-shared-lib ,build-shared-lib
(alist-cons-after (alist-cons-after
'install 'fix-man-dir ,fix-man-dir 'install 'install-shared-lib ,install-shared-lib
(alist-cons-after (alist-delete 'configure %standard-phases))))
'install 'install-shared-lib ,install-shared-lib
(alist-delete 'configure %standard-phases)))))
#:make-flags (list (string-append "PREFIX=" #:make-flags (list (string-append "PREFIX="
(assoc-ref %outputs "out"))) (assoc-ref %outputs "out")))

7
gnu/packages/ncurses.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013, 2014 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
@ -99,11 +99,6 @@
,(string-append "--includedir=" (assoc-ref %outputs "out") ,(string-append "--includedir=" (assoc-ref %outputs "out")
"/include") "/include")
;; By default man pages land in PREFIX/man, but we want them
;; in PREFIX/share/man.
,(string-append "--mandir=" (assoc-ref %outputs "out")
"/share/man")
;; Make sure programs like 'tic', 'reset', and 'clear' have a ;; Make sure programs like 'tic', 'reset', and 'clear' have a
;; correct RUNPATH. ;; correct RUNPATH.
,(string-append "LDFLAGS=-Wl,-rpath=" (assoc-ref %outputs "out") ,(string-append "LDFLAGS=-Wl,-rpath=" (assoc-ref %outputs "out")

9
gnu/packages/pth.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2012, 2015 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
@ -37,12 +37,7 @@
"0ckjqw5kz5m30srqi87idj7xhpw6bpki43mj07bazjm2qmh3cdbj")))) "0ckjqw5kz5m30srqi87idj7xhpw6bpki43mj07bazjm2qmh3cdbj"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:parallel-build? #f '(#:parallel-build? #f))
;; By default, man pages are put in PREFIX/man,
;; but we want them in PREFIX/share/man.
#:configure-flags (list (string-append "--mandir="
(assoc-ref %outputs "out")
"/share/man"))))
(home-page "http://www.gnu.org/software/pth") (home-page "http://www.gnu.org/software/pth")
(synopsis "Portable thread library") (synopsis "Portable thread library")
(description (description

8
gnu/packages/tcl.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
;;; ;;;
@ -63,12 +63,6 @@
"tclsh"))))) "tclsh")))))
%standard-phases)) %standard-phases))
;; By default, man pages are put in PREFIX/man,
;; but we want them in PREFIX/share/man.
#:configure-flags (list (string-append "--mandir="
(assoc-ref %outputs "out")
"/share/man"))
;; XXX: There are a few test failures (related to HTTP, most ;; XXX: There are a few test failures (related to HTTP, most
;; likely related to name resolution), but that doesn't cause ;; likely related to name resolution), but that doesn't cause
;; `make' to fail. ;; `make' to fail.

7
gnu/packages/xiph.scm
View File

@ -202,12 +202,7 @@ OpenBSD's sndio.")
"1p0hh190kqvpkbk1bbajd81jfbmkyl4fn2i7pggk2zppq6m68bgs")))) "1p0hh190kqvpkbk1bbajd81jfbmkyl4fn2i7pggk2zppq6m68bgs"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:parallel-tests? #f `(#:parallel-tests? #f))
;; By default, man pages are put in PREFIX/man,
;; but we want them in PREFIX/share/man.
#:configure-flags (list (string-append "--mandir="
(assoc-ref %outputs "out")
"/share/man"))))
;; FIXME: configure also looks for xmms, input could be added once it exists ;; FIXME: configure also looks for xmms, input could be added once it exists
(inputs `(("libogg" ,libogg))) (inputs `(("libogg" ,libogg)))
(synopsis "Free lossless audio codec") (synopsis "Free lossless audio codec")