nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: stress-make: Patch default shell. 

* gnu/packages/debug.scm (stress-make)[arguments]: Add 'set-default-shell
phase.
This commit is contained in:
Eric Bavier 2017-08-08 21:46:19 -05:00
parent bd5b5ac0c5
commit 05cca6ce90
No known key found for this signature in database
GPG Key ID: FD73CAC719D32566
1 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gnu/packages/debug.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014, 2015, 2016 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2014, 2015, 2016, 2017 Eric Bavier <bavier@member.fsf.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -287,20 +287,26 @@ down the road.")
;; not accept a directory name instead. To let the gnu-build-system's ;; not accept a directory name instead. To let the gnu-build-system's
;; patch-* phases work properly, we unpack the source first, then ;; patch-* phases work properly, we unpack the source first, then
;; repack before the configure phase. ;; repack before the configure phase.
(let ((make-dir (string-append "make-" (package-version gnu-make))))
`(#:configure-flags '("--with-make-tar=./make.tar.xz") `(#:configure-flags '("--with-make-tar=./make.tar.xz")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'unpack-make (add-after 'unpack 'unpack-make
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(zero? (system* "tar" "xf" (assoc-ref inputs "make-source"))))) (zero? (system* "tar" "xf" (assoc-ref inputs "make-source")))))
(add-after 'unpack-make 'set-default-shell
(lambda _
;; Taken mostly directly from (@ (gnu packages base) gnu-make)
(substitute* (string-append ,make-dir "/job.c")
(("default_shell = .*$")
(format #f "default_shell = \"~a\";\n"
(which "sh"))))))
(add-before 'configure 'repack-make (add-before 'configure 'repack-make
(lambda _ (lambda _
(zero? (system* "tar" "cJf" "./make.tar.xz" (zero? (system* "tar" "cJf" "./make.tar.xz" ,make-dir))))
(string-append "make-"
,(package-version gnu-make))))))
(add-before 'configure 'bootstrap (add-before 'configure 'bootstrap
(lambda _ (lambda _
(zero? (system* "autoreconf" "-vfi"))))))) (zero? (system* "autoreconf" "-vfi"))))))))
(home-page "https://github.com/losalamos/stress-make") (home-page "https://github.com/losalamos/stress-make")
(synopsis "Expose race conditions in Makefiles") (synopsis "Expose race conditions in Makefiles")
(description (description