[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
21/30: gnu: bzip2: Use invoke instead of system*.
From: |
Mark H. Weaver |
Subject: |
21/30: gnu: bzip2: Use invoke instead of system*. |
Date: |
Fri, 16 Mar 2018 05:03:38 -0400 (EDT) |
mhw pushed a commit to branch core-updates
in repository guix.
commit 3158bc043e32359b6092e5a8c6bc0008ee7e58d3
Author: Mark H Weaver <address@hidden>
Date: Fri Mar 16 02:28:27 2018 -0400
gnu: bzip2: Use invoke instead of system*.
* gnu/packages/compression.scm (bzip2)[arguments]: Use invoke. In the
custom
configure phase, change the 'if' to 'when' and move the #t outside, so that
it's always returned.
---
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 ea88fb4..04c33ca 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -249,23 +249,23 @@ file; as a result, it is often used in conjunction with
\"tar\", resulting in
(modify-phases %standard-phases
(replace 'configure
(lambda* (#:key target #:allow-other-keys)
- (if ,(%current-target-system)
- ;; Cross-compilation: use the cross tools.
- (substitute* (find-files "." "Makefile")
- (("CC=.*$")
- (string-append "CC = " target "-gcc\n"))
- (("AR=.*$")
- (string-append "AR = " target "-ar\n"))
- (("RANLIB=.*$")
- (string-append "RANLIB = " target "-ranlib\n"))
- (("^all:(.*)test" _ prerequisites)
- ;; Remove 'all' -> 'test' dependency.
- (string-append "all:" prerequisites "\n")))
- #t)))
+ (when ,(%current-target-system)
+ ;; Cross-compilation: use the cross tools.
+ (substitute* (find-files "." "Makefile")
+ (("CC=.*$")
+ (string-append "CC = " target "-gcc\n"))
+ (("AR=.*$")
+ (string-append "AR = " target "-ar\n"))
+ (("RANLIB=.*$")
+ (string-append "RANLIB = " target "-ranlib\n"))
+ (("^all:(.*)test" _ prerequisites)
+ ;; Remove 'all' -> 'test' dependency.
+ (string-append "all:" prerequisites "\n"))))
+ #t))
(add-before 'build 'build-shared-lib
(lambda* (#:key inputs #:allow-other-keys)
(patch-makefile-SHELL "Makefile-libbz2_so")
- (zero? (system* "make" "-f" "Makefile-libbz2_so"))))
+ (invoke "make" "-f" "Makefile-libbz2_so")))
(add-after 'install 'install-shared-lib
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
- branch core-updates updated (80420f1 -> 812cee6), Mark H. Weaver, 2018/03/16
- 05/30: build-system/cmake: Use invoke instead of system*., Mark H. Weaver, 2018/03/16
- 07/30: build-system/python: Use invoke instead of system*., Mark H. Weaver, 2018/03/16
- 08/30: build-system/texlive: Use invoke instead of system*., Mark H. Weaver, 2018/03/16
- 04/30: build-system/glib-or-gtk: Use invoke instead of system*., Mark H. Weaver, 2018/03/16
- 12/30: gnu: linux-libre-headers: Use invoke instead of system*., Mark H. Weaver, 2018/03/16
- 10/30: bootstrap: Use invoke instead of system*., Mark H. Weaver, 2018/03/16
- 19/30: gnu: unzip: Use invoke instead of system*., Mark H. Weaver, 2018/03/16
- 18/30: gnu: zlib: Use invoke instead of system*., Mark H. Weaver, 2018/03/16
- 21/30: gnu: bzip2: Use invoke instead of system*.,
Mark H. Weaver <=
- 06/30: build-system/perl: Use invoke instead of system*., Mark H. Weaver, 2018/03/16
- 14/30: gnu: glibc-locales: Use invoke instead of system*., Mark H. Weaver, 2018/03/16
- 03/30: build-system/gnu: Use invoke instead of system*., Mark H. Weaver, 2018/03/16
- 17/30: gnu: tcsh: Use invoke instead of system*., Mark H. Weaver, 2018/03/16
- 23/30: gnu: eudev: Use invoke instead of system*., Mark H. Weaver, 2018/03/16
- 09/30: build-system/scons: Use invoke instead of system*., Mark H. Weaver, 2018/03/16
- 30/30: gnu: attr: Use invoke instead of system*., Mark H. Weaver, 2018/03/16
- 02/30: gnu-dist: Use invoke instead of system*., Mark H. Weaver, 2018/03/16
- 26/30: cvs-download: Use invoke instead of system*., Mark H. Weaver, 2018/03/16
- 22/30: gnu: openssl: Use invoke instead of system*., Mark H. Weaver, 2018/03/16