gnu: gettext: Use "modify-phases" syntax.
* gnu/packages/gettext.scm (gettext)[arguments]: Use "modify-phases" syntax.
This commit is contained in:
parent
d99861d39d
commit
e5f037624e
|
@ -55,38 +55,37 @@
|
||||||
(inputs
|
(inputs
|
||||||
`(("expat" ,expat)))
|
`(("expat" ,expat)))
|
||||||
(arguments
|
(arguments
|
||||||
`(#:phases (alist-cons-before
|
`(#:phases
|
||||||
'check 'patch-tests
|
(modify-phases %standard-phases
|
||||||
(lambda* (#:key inputs #:allow-other-keys)
|
(add-before 'check 'patch-tests
|
||||||
(let* ((bash (which "sh")))
|
(lambda* (#:key inputs #:allow-other-keys)
|
||||||
;; Some of the files we're patching are
|
(let* ((bash (which "sh")))
|
||||||
;; ISO-8859-1-encoded, so choose it as the default
|
;; Some of the files we're patching are
|
||||||
;; encoding so the byte encoding is preserved.
|
;; ISO-8859-1-encoded, so choose it as the default
|
||||||
(with-fluids ((%default-port-encoding #f))
|
;; encoding so the byte encoding is preserved.
|
||||||
(substitute*
|
(with-fluids ((%default-port-encoding #f))
|
||||||
(find-files "gettext-tools/tests"
|
(substitute*
|
||||||
"^(lang-sh|msg(exec|filter)-[0-9])")
|
(find-files "gettext-tools/tests"
|
||||||
(("#![[:blank:]]/bin/sh")
|
"^(lang-sh|msg(exec|filter)-[0-9])")
|
||||||
(format #f "#!~a" bash)))
|
(("#![[:blank:]]/bin/sh")
|
||||||
|
(format #f "#!~a" bash)))
|
||||||
|
|
||||||
(substitute* (cons "gettext-tools/src/msginit.c"
|
(substitute* (cons "gettext-tools/src/msginit.c"
|
||||||
(find-files "gettext-tools/gnulib-tests"
|
(find-files "gettext-tools/gnulib-tests"
|
||||||
"posix_spawn"))
|
"posix_spawn"))
|
||||||
(("/bin/sh")
|
(("/bin/sh")
|
||||||
bash))
|
bash))
|
||||||
|
|
||||||
(substitute* "gettext-tools/src/project-id"
|
(substitute* "gettext-tools/src/project-id"
|
||||||
(("/bin/pwd")
|
(("/bin/pwd")
|
||||||
"pwd")))))
|
"pwd"))))))
|
||||||
(alist-cons-before
|
(add-before 'configure 'link-expat
|
||||||
'configure 'link-expat
|
(lambda _
|
||||||
(lambda _
|
;; Gettext defaults to opening expat via dlopen on
|
||||||
;; Gettext defaults to opening expat via dlopen on
|
;; "Linux". Change to link directly.
|
||||||
;; "Linux". Change to link directly.
|
(substitute* "gettext-tools/configure"
|
||||||
(substitute* "gettext-tools/configure"
|
(("LIBEXPAT=\"-ldl\"") "LIBEXPAT=\"-ldl -lexpat\"")
|
||||||
(("LIBEXPAT=\"-ldl\"") "LIBEXPAT=\"-ldl -lexpat\"")
|
(("LTLIBEXPAT=\"-ldl\"") "LTLIBEXPAT=\"-ldl -lexpat\"")))))
|
||||||
(("LTLIBEXPAT=\"-ldl\"") "LTLIBEXPAT=\"-ldl -lexpat\"")))
|
|
||||||
%standard-phases))
|
|
||||||
|
|
||||||
;; When tests fail, we want to know the details.
|
;; When tests fail, we want to know the details.
|
||||||
#:make-flags '("VERBOSE=yes")))
|
#:make-flags '("VERBOSE=yes")))
|
||||||
|
|
Loading…
Reference in New Issue