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

build-system/gnu: Improve support for "lib" outputs; support "doc" outputs. 

* guix/build/gnu-build-system.scm (configure)[package-name]: New
  procedure.
  When LIBDIR is true and INCLUDEDIR is false, add
  --includedir=LIBDIR/include.
  Add support for --docdir when a "doc" output exists.
This commit is contained in:
Ludovic Courtès 2013-01-10 00:08:40 +01:00
parent 9149f1a087
commit a06a99ff77
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
guix/build/gnu-build-system.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, 2013 Ludovic Courtès <ludo@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -115,10 +115,20 @@ makefiles."
(define* (configure #:key inputs outputs (configure-flags '()) out-of-source? (define* (configure #:key inputs outputs (configure-flags '()) out-of-source?
#:allow-other-keys) #:allow-other-keys)
(define (package-name)
(let* ((out (assoc-ref outputs "out"))
(base (basename out))
(dash (string-rindex base #\-)))
;; XXX: We'd rather use `package-name->name+version' or similar.
(if dash
(substring base 0 dash)
base)))
(let* ((prefix (assoc-ref outputs "out")) (let* ((prefix (assoc-ref outputs "out"))
(bindir (assoc-ref outputs "bin")) (bindir (assoc-ref outputs "bin"))
(libdir (assoc-ref outputs "lib")) (libdir (assoc-ref outputs "lib"))
(includedir (assoc-ref outputs "include")) (includedir (assoc-ref outputs "include"))
(docdir (assoc-ref outputs "doc"))
(bash (or (and=> (assoc-ref inputs "bash") (bash (or (and=> (assoc-ref inputs "bash")
(cut string-append <> "/bin/bash")) (cut string-append <> "/bin/bash"))
"/bin/sh")) "/bin/sh"))
@ -133,12 +143,21 @@ makefiles."
(list (string-append "--bindir=" bindir "/bin")) (list (string-append "--bindir=" bindir "/bin"))
'()) '())
,@(if libdir ,@(if libdir
(list (string-append "--libdir=" libdir "/lib")) (cons (string-append "--libdir=" libdir "/lib")
(if includedir
'()
(list
(string-append "--includedir="
libdir "/include"))))
'()) '())
,@(if includedir ,@(if includedir
(list (string-append "--includedir=" (list (string-append "--includedir="
includedir "/include")) includedir "/include"))
'()) '())
,@(if docdir
(list (string-append "--docdir=" docdir
"/doc/" (package-name)))
'())
,@configure-flags)) ,@configure-flags))
(abs-srcdir (getcwd)) (abs-srcdir (getcwd))
(srcdir (if out-of-source? (srcdir (if out-of-source?