From f5b7894942e91ae1cf01138f1ae81c140c9fab35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 20 Dec 2012 19:01:14 +0100 Subject: [PATCH] distro: m4: Patch references to /bin/sh. * distro/packages/m4.scm (m4): Add `pre-check' phase. --- distro/packages/m4.scm | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/distro/packages/m4.scm b/distro/packages/m4.scm index 19243a8c2d..ec0e1a868c 100644 --- a/distro/packages/m4.scm +++ b/distro/packages/m4.scm @@ -46,7 +46,19 @@ #:patches (list (assoc-ref %build-inputs "patch/s_isdir") (assoc-ref %build-inputs "patch/readlink-EINVAL") - (assoc-ref %build-inputs "patch/gets")))) + (assoc-ref %build-inputs "patch/gets")) + #:phases (alist-cons-before + 'check 'pre-check + (lambda* (#:key inputs #:allow-other-keys) + ;; Fix references to /bin/sh. + (let ((bash (assoc-ref inputs "bash"))) + (for-each patch-shebang + (find-files "tests" "\\.sh$")) + (substitute* (find-files "tests" + "posix_spawn") + (("/bin/sh") + (format #f "~a/bin/bash" bash))))) + %standard-phases))) ((system cross-system) `(#:patches (list (assoc-ref %build-inputs "patch/s_isdir") (assoc-ref %build-inputs