me
/
guix
Archived
1
0
Fork 0
Code

distro: attr: Fix references to /bin/sh. 

* distro/packages/attr.scm (attr): Add `patch-makefile-SHELL'.  Patch
  `test/run' in `check' phase.
master
Ludovic Courtès 2012-12-21 23:52:48 +01:00
parent c089511288
commit 380d5decfc
1 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
distro/packages/attr.scm
View File

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