[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
06/14: gnu: glibc-hurd-headers: Update phase style.
From: |
Tobias Geerinckx-Rice |
Subject: |
06/14: gnu: glibc-hurd-headers: Update phase style. |
Date: |
Tue, 20 Feb 2018 10:06:35 -0500 (EST) |
nckx pushed a commit to branch core-updates
in repository guix.
commit c04e5116934122bb1ad8853d252081b38d0f5476
Author: Tobias Geerinckx-Rice <address@hidden>
Date: Tue Feb 20 04:16:00 2018 +0100
gnu: glibc-hurd-headers: Update phase style.
* gnu/packages/base.scm (glibc/hurd-headers)[arguments]: Use
MODIFY-PHASES syntax and INVOKE, and end phases with #t.
---
gnu/packages/base.scm | 44 ++++++++++++++++++++------------------------
1 file changed, 20 insertions(+), 24 deletions(-)
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index 1ea095a..7607755 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -12,6 +12,7 @@
;;; Copyright © 2017 Mathieu Othacehe <address@hidden>
;;; Copyright © 2017 Marius Bakke <address@hidden>
;;; Copyright © 2017 Eric Bavier <address@hidden>
+;;; Copyright © 2018 Tobias Geerinckx-Rice <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -1052,30 +1053,25 @@ command.")
"--host=i586-pc-gnu"
"--enable-obsolete-rpc"))
((#:phases _)
- '(alist-replace
- 'install
- (lambda* (#:key outputs #:allow-other-keys)
- (and (zero? (system* "make" "install-headers"))
-
- ;; Make an empty stubs.h to work around not being able to
- ;; produce a valid stubs.h and causing the build to fail. See
- ;;
<http://lists.gnu.org/archive/html/guix-devel/2014-04/msg00233.html>.
- (let ((out (assoc-ref outputs "out")))
- (close-port
- (open-output-file
- (string-append out "/include/gnu/stubs.h"))))))
-
- ;; Nothing to build.
- (alist-delete
- 'build
-
- (alist-cons-before
- 'configure 'pre-configure
- (lambda _
- ;; Use the right 'pwd'.
- (substitute* "configure"
- (("/bin/pwd") "pwd")))
- %standard-phases))))))))
+ '(modify-phases %standard-phases
+ (replace 'install
+ (lambda* (#:key outputs #:allow-other-keys)
+ (invoke "make" "install-headers")
+
+ ;; Make an empty stubs.h to work around not being able to
+ ;; produce a valid stubs.h and causing the build to fail. See
+ ;;
<http://lists.gnu.org/archive/html/guix-devel/2014-04/msg00233.html>.
+ (let ((out (assoc-ref outputs "out")))
+ (close-port
+ (open-output-file
+ (string-append out "/include/gnu/stubs.h"))))))
+ (delete 'build) ; nothing to build
+ (add-before 'configure 'patch-configure-script
+ (lambda _
+ ;; Use the right 'pwd'.
+ (substitute* "configure"
+ (("/bin/pwd") "pwd"))
+ #t))))))))
(define-public tzdata
(package
- branch core-updates updated (cb4a178 -> 3d2d5eb), Tobias Geerinckx-Rice, 2018/02/20
- 14/14: gnu: gnurl: Add HTTP/2 support., Tobias Geerinckx-Rice, 2018/02/20
- 10/14: gnu: intltool: Update phase style., Tobias Geerinckx-Rice, 2018/02/20
- 02/14: gnu: gts: Update phase style., Tobias Geerinckx-Rice, 2018/02/20
- 06/14: gnu: glibc-hurd-headers: Update phase style.,
Tobias Geerinckx-Rice <=
- 04/14: gnu: commencement: Update phase style., Tobias Geerinckx-Rice, 2018/02/20
- 07/14: gnu: dblatex: Update phase style., Tobias Geerinckx-Rice, 2018/02/20
- 05/14: gnu: address@hidden: Update phase style., Tobias Geerinckx-Rice, 2018/02/20
- 03/14: gnu: address@hidden: Update phase style., Tobias Geerinckx-Rice, 2018/02/20
- 09/14: gnu: make-bootstrap: Update phase style., Tobias Geerinckx-Rice, 2018/02/20
- 12/14: gnu: cross-base: Update phase style., Tobias Geerinckx-Rice, 2018/02/20
- 13/14: gnu: patchelf: Update phase style., Tobias Geerinckx-Rice, 2018/02/20
- 01/14: gnu: util-macros: Update phase style., Tobias Geerinckx-Rice, 2018/02/20
- 11/14: gnu: indent: Update phase style., Tobias Geerinckx-Rice, 2018/02/20
- 08/14: gnu: libffi: Update phase style., Tobias Geerinckx-Rice, 2018/02/20