[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
15/30: gnu: glibc/hurd: Use invoke instead of system*.
From: |
Mark H. Weaver |
Subject: |
15/30: gnu: glibc/hurd: Use invoke instead of system*. |
Date: |
Fri, 16 Mar 2018 05:03:37 -0400 (EDT) |
mhw pushed a commit to branch core-updates
in repository guix.
commit 4e50f1f2d3cd6e60c1370c62d699ed6ac6460275
Author: Mark H Weaver <address@hidden>
Date: Fri Mar 16 01:14:02 2018 -0400
gnu: glibc/hurd: Use invoke instead of system*.
* gnu/packages/base.scm (glibc/hurd)[arguments]: In the build phase
procedure,
use 'invoke' instead of 'system*' and remove the vestigial result code
plumbing. Change the local macro 'make' into a normal procedure.
---
gnu/packages/base.scm | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index 336a2f9..a6da2f7 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -2,7 +2,7 @@
;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès
<address@hidden>
;;; Copyright © 2014 Andreas Enge <address@hidden>
;;; Copyright © 2012 Nikita Karetnikov <address@hidden>
-;;; Copyright © 2014, 2015, 2016 Mark H Weaver <address@hidden>
+;;; Copyright © 2014, 2015, 2016, 2018 Mark H Weaver <address@hidden>
;;; Copyright © 2014 Alex Kost <address@hidden>
;;; Copyright © 2014, 2015 Manolis Fragkiskos Ragkousis <address@hidden>
;;; Copyright © 2016, 2017 Efraim Flashner <address@hidden>
@@ -805,14 +805,13 @@ with the Linux kernel.")
;; Force mach/hurd/libpthread subdirs to build first in order
to avoid
;; linking errors.
;; See
<https://lists.gnu.org/archive/html/bug-hurd/2016-11/msg00045.html>
- (let ((-j (list "-j" (number->string (parallel-job-count)))))
- (let-syntax ((make (syntax-rules ()
- ((_ target)
- (zero? (apply system* "make" target
-j))))))
- (and (make "mach/subdir_lib")
- (make "hurd/subdir_lib")
- (make "libpthread/subdir_lib")
- (zero? (apply system* "make" -j)))))))))
+ (let ((flags (list "-j" (number->string (parallel-job-count)))))
+ (define (make target)
+ (apply invoke "make" target flags))
+ (make "mach/subdir_lib")
+ (make "hurd/subdir_lib")
+ (make "libpthread/subdir_lib")
+ (apply invoke "make" flags))))))
((#:configure-flags original-configure-flags)
`(append (list "--host=i586-pc-gnu"
- 03/30: build-system/gnu: Use invoke instead of system*., (continued)
- 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
- 20/30: gnu: zip: Use invoke instead of system*., Mark H. Weaver, 2018/03/16
- 11/30: download: Use invoke instead of system*., Mark H. Weaver, 2018/03/16
- 15/30: gnu: glibc/hurd: Use invoke instead of system*.,
Mark H. Weaver <=
- 29/30: build: emacs-utils: Use invoke instead of system*., Mark H. Weaver, 2018/03/16
- 27/30: svn-download: Use invoke instead of system*., Mark H. Weaver, 2018/03/16
- 13/30: gnu: glibc-utf8-locales: Use invoke instead of system*., Mark H. Weaver, 2018/03/16
- 28/30: hg-download: Use invoke instead of system*., Mark H. Weaver, 2018/03/16
- 24/30: gnu: tzdata: Use invoke instead of system*., Mark H. Weaver, 2018/03/16
- 01/30: packages: patch-and-repack: Use invoke instead of system*., Mark H. Weaver, 2018/03/16
- 16/30: gnu: perl: Use invoke instead of system*., Mark H. Weaver, 2018/03/16
- 25/30: gnu: python-six: Use invoke instead of system*., Mark H. Weaver, 2018/03/16