From fd466fb81558aa9e0e83c9bf26cc1d2bc594a8ce Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Fri, 18 Jan 2019 00:30:28 -0600 Subject: gnu: stress-make: Fix glob configuration. * gnu/packages/debug.scm (stress-make)[arguments]: Adopt configure cache value "make_cv_sys_gnu_glob=yes" from gnu-make package. --- gnu/packages/debug.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/debug.scm') diff --git a/gnu/packages/debug.scm b/gnu/packages/debug.scm index 7cb162918a5..4e63c81b644 100644 --- a/gnu/packages/debug.scm +++ b/gnu/packages/debug.scm @@ -285,7 +285,8 @@ down the road.") ;; patch-* phases work properly, we unpack the source first, then ;; 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" + "make_cv_sys_gnu_glob=yes") #:phases (modify-phases %standard-phases (add-after 'unpack 'unpack-make -- cgit v1.3 From 75ac5e20bcd6eb6d177c0e7d787cb377a4c69d20 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 26 Jan 2019 22:32:44 +0100 Subject: gnu: american-fuzzy-lop: Unconditionally return #T from build phases. * gnu/packages/debug.scm (american-fuzzy-lop)[arguments]: Use INVOKE and unconditionally return #T from build phases. --- gnu/packages/debug.scm | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'gnu/packages/debug.scm') diff --git a/gnu/packages/debug.scm b/gnu/packages/debug.scm index 4e63c81b644..b15e3749971 100644 --- a/gnu/packages/debug.scm +++ b/gnu/packages/debug.scm @@ -194,10 +194,8 @@ tools that process C/C++ code.") (patch-dir (string-append afl-dir "/qemu_mode/patches"))) - (unless (zero? - (system* "tar" "xf" - (assoc-ref inputs "afl-src"))) - (error "tar failed to unpack afl-src")) + (invoke "tar" "xf" + (assoc-ref inputs "afl-src")) (install-file (string-append patch-dir "/afl-qemu-cpu-inl.h") ".") @@ -210,11 +208,12 @@ tools that process C/C++ code.") (substitute* (string-append patch-dir "/cpu-exec.diff") (("\\.\\./patches/") "")) - (every (lambda (patch-file) - (zero? (system* "patch" "--force" "-p1" - "--input" patch-file))) - (find-files patch-dir - "\\.diff$")))))))))))))) + (for-each (lambda (patch-file) + (invoke "patch" "--force" "-p1" + "--input" patch-file)) + (find-files patch-dir + "\\.diff$")) + #t)))))))))))) (arguments `(#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")) "CC=gcc") -- cgit v1.3 From 4aa266a0c6c51ad556464f560cf9b744ac577575 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 26 Jan 2019 22:34:04 +0100 Subject: gnu: stress-make: Use INVOKE. * gnu/packages/debug.scm (stress-make)[arguments]: Use INVOKE. --- gnu/packages/debug.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/debug.scm') diff --git a/gnu/packages/debug.scm b/gnu/packages/debug.scm index b15e3749971..0f4a654e627 100644 --- a/gnu/packages/debug.scm +++ b/gnu/packages/debug.scm @@ -290,7 +290,7 @@ down the road.") (modify-phases %standard-phases (add-after 'unpack 'unpack-make (lambda* (#:key inputs #:allow-other-keys) - (zero? (system* "tar" "xf" (assoc-ref inputs "make-source"))))) + (invoke "tar" "xf" (assoc-ref inputs "make-source")))) (add-after 'unpack-make 'set-default-shell (lambda _ ;; Taken mostly directly from (@ (gnu packages base) gnu-make) @@ -300,7 +300,7 @@ down the road.") (which "sh")))))) (add-before 'configure 'repack-make (lambda _ - (zero? (system* "tar" "cJf" "./make.tar.xz" ,make-dir)))))))) + (invoke "tar" "cJf" "./make.tar.xz" ,make-dir))))))) (home-page "https://github.com/losalamos/stress-make") (synopsis "Expose race conditions in Makefiles") (description -- cgit v1.3