mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-02-07 03:20:04 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: gawk: Use G-expressions and remove labels.

Browse source 
* gnu/packages/gawk.scm (gawk)[arguments]: Convert to G-expression.  Use
SEARCH-INPUT-FILE instead of label.
This commit is contained in:
Marius Bakke 2022-06-26 14:50:14 +02:00
parent 003128f2f3
commit da25a43f2d
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
1 changed files with 26 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
gnu/packages/gawk.scm
View file

@ -25,6 +25,7 @@
#:use-module (gnu packages bash) #:use-module (gnu packages bash)
#:use-module (gnu packages libsigsegv) #:use-module (gnu packages libsigsegv)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix gexp)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix build-system gnu)) #:use-module (guix build-system gnu))
@ -40,36 +41,36 @@
(base32 "18kybw47fb1sdagav7aj95r9pp09r5gm202y3ahvwjw9dqw2jxnq")))) (base32 "18kybw47fb1sdagav7aj95r9pp09r5gm202y3ahvwjw9dqw2jxnq"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases (modify-phases %standard-phases (list #:phases
(add-before 'configure 'set-shell-file-name #~(modify-phases %standard-phases
(lambda* (#:key inputs #:allow-other-keys) (add-before 'configure 'set-shell-file-name
;; Refer to the right shell. (lambda* (#:key inputs #:allow-other-keys)
(let ((bash (assoc-ref inputs "bash"))) ;; Refer to the right shell.
(substitute* "io.c" (let ((/bin/sh (search-input-file inputs "bin/sh")))
(("/bin/sh") (substitute* "io.c"
(string-append bash "/bin/sh"))) (("/bin/sh") /bin/sh))
;; When cross-compiling, remove dependencies on the ;; When cross-compiling, remove dependencies on the
;; `check-for-shared-lib-support' target, which tries ;; `check-for-shared-lib-support' target, which tries
;; to 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))))
'())))) '()))))
(add-before 'check 'adjust-test-infrastructure (add-before '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.
(substitute* "test/Makefile" (substitute* "test/Makefile"
(("\\| more") "")) (("\\| more") ""))
;; Adjust the shebang in that file since it is then diff'd ;; Adjust the shebang in that file since it is then diff'd
;; against the actual test output. ;; against the actual test output.
(substitute* "test/watchpoint1.ok" (substitute* "test/watchpoint1.ok"
(("#! /usr/bin/gawk") (("#! /usr/bin/gawk")
(string-append "#!" (which "gawk"))))))))) (string-append "#!" (which "gawk")))))))))
(inputs (list libsigsegv (inputs (list libsigsegv
;; Use the full-fledged Bash package, otherwise the test suite ;; Use the full-fledged Bash package, otherwise the test suite