From 380d5decfcd3a25c11dfa7e78e2197af98a35307 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Fri, 21 Dec 2012 23:52:48 +0100
Subject: distro: attr: Fix references to /bin/sh.

* distro/packages/attr.scm (attr): Add `patch-makefile-SHELL'.  Patch
  `test/run' in `check' phase.
---
 distro/packages/attr.scm | 43 +++++++++++++++++++++++++++----------------
 1 file changed, 27 insertions(+), 16 deletions(-)

(limited to 'distro/packages')

diff --git a/distro/packages/attr.scm b/distro/packages/attr.scm
index 38c75fc2ae..ad2cd3987a 100644
--- a/distro/packages/attr.scm
+++ b/distro/packages/attr.scm
@@ -41,23 +41,34 @@
     (build-system gnu-build-system)
     (arguments
      `(#:phases
-       (alist-replace 'install
-                      (lambda _
-                        (zero? (system* "make"
-                                        "install"
-                                        "install-lib"
-                                        "install-dev")))
-                      (alist-replace 'check
-                                     (lambda _
-                                       (for-each patch-shebang
-                                                 (find-files "test" ".*"))
-                                       (system* "make" "tests" "-C" "test")
+       (alist-cons-after
+        'configure 'patch-makefile-SHELL
+        (lambda _
+          (patch-makefile-SHELL "include/buildmacros"))
+        (alist-replace
+         'install
+         (lambda _
+           (zero? (system* "make"
+                           "install"
+                           "install-lib"
+                           "install-dev")))
+         (alist-replace
+          'check
+          (lambda _
+            ;; Use the right shell.
+            (let ((bash (search-path (search-path-as-string->list
+                                      (getenv "PATH"))
+                                     "bash")))
+              (substitute* "test/run"
+                (("/bin/sh")
+                 (string-append bash "/bin/bash"))))
 
-                                       ;; XXX: Ignore the test result since
-                                       ;; this is dependent on the underlying
-                                       ;; file system.
-                                       #t)
-                                     %standard-phases))))
+            (system* "make" "tests" "-C" "test")
+
+            ;; XXX: Ignore the test result since this is dependent on the
+            ;; underlying file system.
+            #t)
+          %standard-phases)))))
     (inputs `(("perl" ,perl)
               ("gettext" ,guix:gettext)))
     (home-page
-- 
cgit v1.2.3