Browse Source

gnu-build-system: Structure as a customizable sequence of phases.

* guix/build/gnu-build-system.scm (set-paths, build, check, install):
  New procedures.
  (unpack): Make `source' a keyword arg; add `#:allow-other-keys'.
  (configure): Likewise.
  (%standard-phases): New variable.
  (gnu-build): Make `source', `outputs', and `inputs' keyword arguments;
  add `phases' keyword argument; #:allow-other-keys; add rest arguments
  `args'.  Invoke each of PHASES in order within `every'.

* guix/gnu-build-system.scm (gnu-build): Add `make-flags' and `phases'
  keyword arguments.  Update builder's `gnu-build' call to match the new
  convention.
gn-latest-20200428
Ludovic Courtès 9 years ago
parent
commit
5dcfdcaa79
2 changed files with 64 additions and 36 deletions
  1. +55
    -30
      guix/build/gnu-build-system.scm
  2. +9
    -6
      guix/gnu-build-system.scm

+ 55
- 30
guix/build/gnu-build-system.scm View File

@ -19,7 +19,10 @@
(define-module (guix build gnu-build-system)
#:use-module (guix build utils)
#:use-module (ice-9 ftw)
#:export (gnu-build))
#:use-module (ice-9 match)
#:use-module (srfi srfi-1)
#:export (%standard-phases
gnu-build))
;; Commentary:
;;
@ -43,37 +46,59 @@
#f
dir))
(define (unpack source)
(system* "tar" "xvf" source)
(chdir (first-subdirectory ".")))
(define* (set-paths #:key inputs #:allow-other-keys)
(let ((inputs (map cdr inputs)))
(set-path-environment-variable "PATH" '("bin") inputs)
(set-path-environment-variable "CPATH" '("include") inputs)
(set-path-environment-variable "LIBRARY_PATH" '("lib" "lib64") inputs)))
(define (configure outputs flags)
(define* (unpack #:key source #:allow-other-keys)
(and (zero? (system* "tar" "xvf" source))
(chdir (first-subdirectory "."))))
(define* (configure #:key outputs (configure-flags '()) #:allow-other-keys)
(let ((prefix (assoc-ref outputs "out"))
(libdir (assoc-ref outputs "lib"))
(includedir (assoc-ref outputs "include")))
(apply system* "./configure"
"--enable-fast-install"
(string-append "--prefix=" prefix)
`(,@(if libdir
(list (string-append "--libdir=" libdir))
'())
,@(if includedir
(list (string-append "--includedir=" includedir))
'())
,@flags))))
(zero? (apply system* "./configure"
"--enable-fast-install"
(string-append "--prefix=" prefix)
`(,@(if libdir
(list (string-append "--libdir=" libdir))
'())
,@(if includedir
(list (string-append "--includedir=" includedir))
'())
,@configure-flags)))))
(define* (gnu-build source outputs inputs
#:key (configure-flags '()))
"Build from SOURCE to OUTPUTS, using INPUTS."
(let ((inputs (map cdr inputs)))
(set-path-environment-variable "PATH" '("bin") inputs)
(set-path-environment-variable "CPATH" '("include") inputs)
(set-path-environment-variable "LIBRARY_PATH" '("lib" "lib64") inputs))
(pk (getenv "PATH"))
(pk 'inputs inputs)
(system* "ls" "/nix/store")
(unpack source)
(configure outputs configure-flags)
(system* "make")
(system* "make" "check")
(system* "make" "install"))
(define* (build #:key (make-flags '()) #:allow-other-keys)
(zero? (apply system* "make" make-flags)))
(define* (check #:key (make-flags '()) #:allow-other-keys)
(zero? (apply system* "make" "check" make-flags)))
(define* (install #:key (make-flags '()) #:allow-other-keys)
(zero? (apply system* "make" "install" make-flags)))
(define %standard-phases
;; Standard build phases, as a list of symbol/procedure pairs.
(let-syntax ((phases (syntax-rules ()
((_ p ...) `((p . ,p) ...)))))
(phases set-paths unpack configure build check install)))
(define* (gnu-build #:key (source #f) (outputs #f) (inputs #f)
(phases %standard-phases)
#:allow-other-keys
#:rest args)
"Build from SOURCE to OUTPUTS, using INPUTS, and by running all of PHASES
in order. Return #t if all the PHASES succeeded, #f otherwise."
(setvbuf (current-output-port) _IOLBF)
;; The trick is to #:allow-other-keys everywhere, so that each procedure in
;; PHASES can pick the keyword arguments it's interested in.
(every (match-lambda
((name . proc)
(format #t "starting phase `~a'~%" name)
(apply proc args)))
phases))

+ 9
- 6
guix/gnu-build-system.scm View File

@ -39,18 +39,21 @@
(define* (gnu-build store name source inputs
#:key (outputs '("out")) (configure-flags '())
(make-flags '()) (phases '%standard-phases)
(system (%current-system)))
"Return a derivation called NAME that builds from tarball SOURCE, with
input derivation INPUTS, using the usual procedure of the GNU Build System."
(define builder
`(begin
(use-modules (guix build gnu-build-system))
(gnu-build ,(if (derivation-path? source)
(derivation-path->output-path source)
source)
%outputs
%build-inputs
#:configure-flags ',configure-flags)))
(gnu-build #:source ,(if (derivation-path? source)
(derivation-path->output-path source)
source)
#:outputs %outputs
#:inputs %build-inputs
#:phases ,phases
#:configure-flags ',configure-flags
#:make-flags ',make-flags)))
(build-expression->derivation store name system
builder


Loading…
Cancel
Save