diff options
author | Ricardo Wurmus <rekado@elephly.net> | 2019-02-06 13:03:26 +0100 |
---|---|---|
committer | Ricardo Wurmus <rekado@elephly.net> | 2019-02-06 13:03:26 +0100 |
commit | ba88eea2b3a8a33ecd7fc0ec64e3917c6c2fe21d (patch) | |
tree | 75c68e44d3d76440f416552711b1a47ec83e411e /gnu/packages/debug.scm | |
parent | f380f9d55e6757c242acf6c71c4a3ccfcdb066b2 (diff) | |
parent | 4aeb7f34c948f32363f2ae29c6942c6328df758c (diff) | |
download | guix-patches-ba88eea2b3a8a33ecd7fc0ec64e3917c6c2fe21d.tar guix-patches-ba88eea2b3a8a33ecd7fc0ec64e3917c6c2fe21d.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/debug.scm')
-rw-r--r-- | gnu/packages/debug.scm | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/gnu/packages/debug.scm b/gnu/packages/debug.scm index 7cb162918a..0f4a654e62 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") @@ -285,12 +284,13 @@ 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 (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 |