me
/
guix
Archived
1
0
Fork 0
Code

build-system/gnu: Change the order of `patch-source-shebangs' and `patch'. 

* guix/build/gnu-build-system.scm (patch-source-shebangs): Add a newline
  after the "SHELL =" line in po/Makefile.in.in.
  (%standard-phases): Move `patch-source-shebangs' after `patch'.
master
Ludovic Courtès 2012-12-18 22:21:21 +01:00
parent 45298f8fd2
commit c3ee7448c9
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
guix/build/gnu-build-system.scm
View File

@ -98,7 +98,7 @@
(when (file-exists? "po/Makefile.in.in") (when (file-exists? "po/Makefile.in.in")
(substitute* "po/Makefile.in.in" (substitute* "po/Makefile.in.in"
(("^SHELL[[:blank:]]*=.*$") (("^SHELL[[:blank:]]*=.*$")
(string-append "SHELL = " bash)))))) (string-append "SHELL = " bash "\n"))))))
(define* (patch #:key (patches '()) (patch-flags '("--batch" "-p1")) (define* (patch #:key (patches '()) (patch-flags '("--batch" "-p1"))
#:allow-other-keys) #:allow-other-keys)
@ -249,7 +249,7 @@
;; 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 patch-source-shebangs patch configure (phases set-paths unpack patch patch-source-shebangs configure
build check install build check install
patch-shebangs strip))) patch-shebangs strip)))