mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-02-05 18:29:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

build-system: Use 'input-tuples->gexp' and 'outputs->gexp'.

Browse source 
* guix/gexp.scm (input-tuples->gexp, outputs->gexp): Make public.
* guix/build-system/cargo.scm (cargo-build): Use them.
* guix/build-system/gnu.scm (gnu-cross-build): Likewise.
* guix/build-system/ocaml.scm (ocaml-build): Likewise.
* guix/build-system/cmake.scm (cmake-cross-build): Likewise.
This commit is contained in:
Ludovic Courtès 2021-02-28 22:40:06 +01:00
parent f95fc73248
commit 6cd591155c
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
5 changed files with 15 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
guix/build-system/cargo.scm
View file

@ -114,13 +114,8 @@ to NAME and VERSION."
#:phases #$(if (pair? phases) #:phases #$(if (pair? phases)
(sexp->gexp phases) (sexp->gexp phases)
phases) phases)
#:outputs (list #$@(map (lambda (name) #:outputs #$(outputs->gexp outputs)
#~(cons #$name #:inputs #$(input-tuples->gexp inputs)
(ungexp output name)))
outputs))
#:inputs (map (lambda (tuple)
(apply cons tuple))
'#$inputs)
#:search-paths '#$(sexp->gexp #:search-paths '#$(sexp->gexp
(map search-path-specification->sexp (map search-path-specification->sexp
search-paths)))))) search-paths))))))

14
guix/build-system/cmake.scm
View file

@ -204,20 +204,14 @@ build system."
(use-modules #$@(sexp->gexp modules)) (use-modules #$@(sexp->gexp modules))
(define %build-host-inputs (define %build-host-inputs
(map (lambda (tuple) #+(input-tuples->gexp build-inputs))
(apply cons tuple))
'#+(append build-inputs target-inputs)))
(define %build-target-inputs (define %build-target-inputs
(map (lambda (tuple) (append #$(input-tuples->gexp host-inputs)
(apply cons tuple)) #+(input-tuples->gexp target-inputs)))
'#$host-inputs))
(define %outputs (define %outputs
(list #$@(map (lambda (name) #$(outputs->gexp outputs))
#~(cons #$name
(ungexp output name)))
outputs)))
(cmake-build #:source #+source (cmake-build #:source #+source
#:system #$system #:system #$system

14
guix/build-system/gnu.scm
View file

@ -510,20 +510,14 @@ platform."
(use-modules #$@(sexp->gexp modules)) (use-modules #$@(sexp->gexp modules))
(define %build-host-inputs (define %build-host-inputs
(map (lambda (tuple) #+(input-tuples->gexp build-inputs))
(apply cons tuple))
'#+build-inputs))
(define %build-target-inputs (define %build-target-inputs
(map (lambda (tuple) (append #$(input-tuples->gexp host-inputs)
(apply cons tuple)) #+(input-tuples->gexp target-inputs)))
(append '#$host-inputs '#+target-inputs)))
(define %outputs (define %outputs
(list #$@(map (lambda (name) #$(outputs->gexp outputs))
#~(cons #$name
(ungexp output name)))
outputs)))
(gnu-build #:source #+source (gnu-build #:source #+source
#:system #$system #:system #$system

9
guix/build-system/ocaml.scm
View file

@ -260,13 +260,8 @@ provides a 'setup.ml' file as its build system."
(use-modules #$@modules) (use-modules #$@modules)
(ocaml-build #:source #$source (ocaml-build #:source #$source
#:system #$system #:system #$system
#:outputs (list #$@(map (lambda (name) #:outputs #$(outputs->gexp outputs)
#~(cons #$name #:inputs #$(input-tuples->gexp inputs)
(ungexp output name)))
outputs))
#:inputs (map (lambda (tuple)
(apply cons tuple))
'#$inputs)
#:search-paths '#$(map search-path-specification->sexp #:search-paths '#$(map search-path-specification->sexp
search-paths) search-paths)
#:phases #$phases #:phases #$phases

3
guix/gexp.scm
View file

@ -106,6 +106,9 @@
lowered-gexp-load-compiled-path lowered-gexp-load-compiled-path
with-build-variables with-build-variables
input-tuples->gexp
outputs->gexp
gexp->derivation gexp->derivation
gexp->file gexp->file
gexp->script gexp->script