mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 05:18:07 -05:00
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'.
This commit is contained in:
parent
45298f8fd2
commit
c3ee7448c9
1 changed files with 2 additions and 2 deletions
|
@ -98,7 +98,7 @@ (define* (patch-source-shebangs #:key source #:allow-other-keys)
|
|||
(when (file-exists? "po/Makefile.in.in")
|
||||
(substitute* "po/Makefile.in.in"
|
||||
(("^SHELL[[:blank:]]*=.*$")
|
||||
(string-append "SHELL = " bash))))))
|
||||
(string-append "SHELL = " bash "\n"))))))
|
||||
|
||||
(define* (patch #:key (patches '()) (patch-flags '("--batch" "-p1"))
|
||||
#:allow-other-keys)
|
||||
|
@ -249,7 +249,7 @@ (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 patch-source-shebangs patch configure
|
||||
(phases set-paths unpack patch patch-source-shebangs configure
|
||||
build check install
|
||||
patch-shebangs strip)))
|
||||
|
||||
|
|
Loading…
Reference in a new issue