[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: build-system/meson: Use invoke.
From: |
Ricardo Wurmus |
Subject: |
01/01: build-system/meson: Use invoke. |
Date: |
Sat, 30 Jun 2018 12:07:47 -0400 (EDT) |
rekado pushed a commit to branch core-updates
in repository guix.
commit 302213b9be577bf6e120405ef4316520403fbee3
Author: Ricardo Wurmus <address@hidden>
Date: Sat Jun 30 18:06:20 2018 +0200
build-system/meson: Use invoke.
* guix/build/meson-build-system.scm (configure, build, check, install): Use
"invoke" and unconditionally return #t.
---
guix/build/meson-build-system.scm | 23 +++++++++++++----------
1 file changed, 13 insertions(+), 10 deletions(-)
diff --git a/guix/build/meson-build-system.scm
b/guix/build/meson-build-system.scm
index 7efd433..6dac007 100644
--- a/guix/build/meson-build-system.scm
+++ b/guix/build/meson-build-system.scm
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017 Peter Mikkelsen <address@hidden>
+;;; Copyright © 2018 Ricardo Wurmus <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -58,15 +59,17 @@
(mkdir build-dir)
(chdir build-dir)
- (zero? (apply system* "meson" args))))
+ (apply invoke "meson" args)
+ #t))
(define* (build #:key parallel-build?
#:allow-other-keys)
"Build a given meson package."
- (zero? (apply system* "ninja"
- (if parallel-build?
- `("-j" ,(number->string (parallel-job-count)))
- '("-j" "1")))))
+ (apply invoke "ninja"
+ (if parallel-build?
+ `("-j" ,(number->string (parallel-job-count)))
+ '("-j" "1")))
+ #t)
(define* (check #:key test-target parallel-tests? tests?
#:allow-other-keys)
@@ -75,13 +78,13 @@
(number->string (parallel-job-count))
"1"))
(if tests?
- (zero? (system* "ninja" test-target))
- (begin
- (format #t "test suite not run~%")
- #t)))
+ (invoke "ninja" test-target)
+ (format #t "test suite not run~%"))
+ #t)
(define* (install #:rest args)
- (zero? (system* "ninja" "install")))
+ (invoke "ninja" "install")
+ #t)
(define* (fix-runpath #:key (elf-directories '("lib" "lib64" "libexec"
"bin" "sbin"))