me
/
guix
Archived
1
0
Fork 0
Code

gnu: gawk: Use 'modify-phases'. 

* gnu/packages/gawk.scm (gawk)[arguments]: Use 'modify-phases'.
master
Ludovic Courtès 2016-09-02 15:38:30 +02:00
parent e0649ff3c0
commit 3964e358ab
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 28 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gnu/packages/gawk.scm
View File

@ -40,8 +40,8 @@
(arguments (arguments
`(#:parallel-tests? #f ; test suite fails in parallel `(#:parallel-tests? #f ; test suite fails in parallel
#:phases (alist-cons-before #:phases (modify-phases %standard-phases
'configure 'set-shell-file-name (add-before 'configure 'set-shell-file-name
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
;; Refer to the right shell. ;; Refer to the right shell.
(let ((bash (assoc-ref inputs "bash"))) (let ((bash (assoc-ref inputs "bash")))
@ -50,16 +50,15 @@
(string-append bash "/bin/bash"))) (string-append bash "/bin/bash")))
;; When cross-compiling, remove dependencies on the ;; When cross-compiling, remove dependencies on the
;; `check-for-shared-lib-support' target, which tries to ;; `check-for-shared-lib-support' target, which tries
;; run the cross-built `gawk'. ;; to run the cross-built `gawk'.
,@(if (%current-target-system) ,@(if (%current-target-system)
'((substitute* "extension/Makefile.in" '((substitute* "extension/Makefile.in"
(("^.*: check-for-shared-lib-support" match) (("^.*: check-for-shared-lib-support" match)
(string-append "### " match)))) (string-append "### " match))))
'()))) '()))))
(alist-cons-before (add-before 'check 'adjust-test-infrastructure
'check 'adjust-test-infrastructure
(lambda _ (lambda _
;; Remove dependency on 'more' (from util-linux), which ;; Remove dependency on 'more' (from util-linux), which
;; would needlessly complicate bootstrapping. ;; would needlessly complicate bootstrapping.
@ -71,9 +70,8 @@
(substitute* "test/watchpoint1.ok" (substitute* "test/watchpoint1.ok"
(("#! /usr/bin/gawk") (("#! /usr/bin/gawk")
(string-append "#!" (which "gawk")))) (string-append "#!" (which "gawk"))))
#t) #t)))))
%standard-phases))))
(inputs `(("libsigsegv" ,libsigsegv) (inputs `(("libsigsegv" ,libsigsegv)
,@(if (%current-target-system) ,@(if (%current-target-system)