ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-25 12:09:15 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

build-system/gnu: Add a `patch' phase.

Browse source 
* guix/build/gnu-build-system.scm (patch): New procedure.
  (%standard-phases): Add `patch'.

* guix/build-system/gnu.scm (gnu-build): Add `patches' and `patch-flags'
  parameters.  Pass them on.
This commit is contained in:
Ludovic Courtès 2012-07-01 17:32:03 +02:00
parent 3e43c64a74
commit 74cd03b1a0
2 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -43,7 +43,9 @@ (define %standard-inputs
(define* (gnu-build store name source inputs (define* (gnu-build store name source inputs
#:key (outputs '("out")) (configure-flags ''()) #:key (outputs '("out")) (configure-flags ''())
(make-flags ''()) (phases '%standard-phases) (make-flags ''())
(patches ''()) (patch-flags ''("--batch" "-p1"))
(phases '%standard-phases)
(system (%current-system)) (system (%current-system))
(modules '((guix build gnu-build-system) (modules '((guix build gnu-build-system)
(guix build utils)))) (guix build utils))))
@ -57,6 +59,8 @@ (define builder
source) source)
#:outputs %outputs #:outputs %outputs
#:inputs %build-inputs #:inputs %build-inputs
#:patches ,patches
#:patch-flags ,patch-flags
#:phases ,phases #:phases ,phases
#:configure-flags ,configure-flags #:configure-flags ,configure-flags
#:make-flags ,make-flags))) #:make-flags ,make-flags)))

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

@ -56,6 +56,14 @@ (define* (unpack #:key source #:allow-other-keys)
(and (zero? (system* "tar" "xvf" source)) (and (zero? (system* "tar" "xvf" source))
(chdir (first-subdirectory ".")))) (chdir (first-subdirectory "."))))
(define* (patch #:key (patches '()) (patch-flags '("--batch" "-p1"))
#:allow-other-keys)
(every (lambda (p)
(format #t "applying patch `~a'~%" p)
(zero? (apply system* "patch"
(append patch-flags (list p)))))
patches))
(define* (configure #:key outputs (configure-flags '()) #:allow-other-keys) (define* (configure #:key outputs (configure-flags '()) #:allow-other-keys)
(let* ((prefix (assoc-ref outputs "out")) (let* ((prefix (assoc-ref outputs "out"))
(libdir (assoc-ref outputs "lib")) (libdir (assoc-ref outputs "lib"))
@ -94,7 +102,7 @@ (define %standard-phases
;; Standard build phases, as a list of symbol/procedure pairs. ;; Standard build phases, as a list of symbol/procedure pairs.
(let-syntax ((phases (syntax-rules () (let-syntax ((phases (syntax-rules ()
((_ p ...) `((p . ,p) ...))))) ((_ p ...) `((p . ,p) ...)))))
(phases set-paths unpack configure build check install))) (phases set-paths unpack patch configure build check install)))
(define* (gnu-build #:key (source #f) (outputs #f) (inputs #f) (define* (gnu-build #:key (source #f) (outputs #f) (inputs #f)