[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
15/36: gnu: p7zip: Use invoke.
From: |
Mark H. Weaver |
Subject: |
15/36: gnu: p7zip: Use invoke. |
Date: |
Thu, 12 Apr 2018 04:09:19 -0400 (EDT) |
mhw pushed a commit to branch core-updates
in repository guix.
commit 8fcdd9d53ffdbc77d6bd3af416e2a3c41615e43b
Author: Mark H Weaver <address@hidden>
Date: Fri Mar 16 02:36:06 2018 -0400
gnu: p7zip: Use invoke.
* gnu/packages/compression.scm (p7zip)[arguments]: Use invoke and remove
vestigial plumbing.
---
gnu/packages/compression.scm | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index 32393a4..7bc7d61 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -1420,22 +1420,22 @@ It can be used as a replacement for the Apache
@code{CBZip2InputStream} /
(modify-phases %standard-phases
(replace 'configure
(lambda* (#:key system outputs #:allow-other-keys)
- (zero? (system* "cp"
- (let ((system ,(or (%current-target-system)
- (%current-system))))
- (cond
- ((string-prefix? "x86_64" system)
- "makefile.linux_amd64_asm")
- ((string-prefix? "i686" system)
- "makefile.linux_x86_asm_gcc_4.X")
- (else
- "makefile.linux_any_cpu_gcc_4.X")))
- "makefile.machine"))))
+ (invoke "cp"
+ (let ((system ,(or (%current-target-system)
+ (%current-system))))
+ (cond
+ ((string-prefix? "x86_64" system)
+ "makefile.linux_amd64_asm")
+ ((string-prefix? "i686" system)
+ "makefile.linux_x86_asm_gcc_4.X")
+ (else
+ "makefile.linux_any_cpu_gcc_4.X")))
+ "makefile.machine")))
(replace 'check
(lambda _
- (and (zero? (system* "make" "test"))
- (zero? (system* "make" "test_7z"))
- (zero? (system* "make" "test_7zr"))))))))
+ (invoke "make" "test")
+ (invoke "make" "test_7z")
+ (invoke "make" "test_7zr"))))))
(inputs
(let ((system (or (%current-target-system)
(%current-system))))
- branch core-updates updated (1293f6d -> 4b20e07), Mark H. Weaver, 2018/04/12
- 02/36: gnu: libstdc++-doc: Use invoke., Mark H. Weaver, 2018/04/12
- 06/36: gnu: freefall: Return #t from all phases., Mark H. Weaver, 2018/04/12
- 04/36: gnu: e2fsprogs: Use invoke., Mark H. Weaver, 2018/04/12
- 07/36: gnu: rdma-core: Use invoke., Mark H. Weaver, 2018/04/12
- 29/36: gnu: texlive-texmf: Return #t from all phases., Mark H. Weaver, 2018/04/12
- 15/36: gnu: p7zip: Use invoke.,
Mark H. Weaver <=
- 09/36: gnu: minizip: Use invoke., Mark H. Weaver, 2018/04/12
- 03/36: gnu: gnu-c-manual: Use invoke., Mark H. Weaver, 2018/04/12
- 23/36: gnu: camlp5: Return #t from all phases., Mark H. Weaver, 2018/04/12
- 19/36: gnu: byobu: Return #t from all phases., Mark H. Weaver, 2018/04/12
- 14/36: gnu: java-iq80-snappy: Use invoke., Mark H. Weaver, 2018/04/12
- 28/36: gnu: texlive-texmf: Use invoke instead of system*., Mark H. Weaver, 2018/04/12
- 35/36: gnu: gdb: Return #t from all phases., Mark H. Weaver, 2018/04/12
- 30/36: gnu: iniparser: Return #t from all phases., Mark H. Weaver, 2018/04/12
- 31/36: gnu: fontforge: Return #t from all phases., Mark H. Weaver, 2018/04/12
- 18/36: gnu: dtach: Return #t from all phases., Mark H. Weaver, 2018/04/12