[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/08: build-system/gnu: Return a boolean from all phase procedures.
From: |
Mark H. Weaver |
Subject: |
01/08: build-system/gnu: Return a boolean from all phase procedures. |
Date: |
Fri, 16 Mar 2018 06:48:58 -0400 (EDT) |
mhw pushed a commit to branch core-updates
in repository guix.
commit e9b23fe8bd7c78da1b7b1ed8fd86830260fdbb20
Author: Mark H Weaver <address@hidden>
Date: Fri Mar 16 06:04:38 2018 -0400
build-system/gnu: Return a boolean from all phase procedures.
* guix/build/gnu-build-system.scm (patch-source-shebangs)
(patch-generated-file-shebangs, strip): Return #t.
(validate-runpath): Raise an exception if validation fails. Never return
#f.
---
guix/build/gnu-build-system.scm | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/guix/build/gnu-build-system.scm b/guix/build/gnu-build-system.scm
index 92d5cb3..f49de0e 100644
--- a/guix/build/gnu-build-system.scm
+++ b/guix/build/gnu-build-system.scm
@@ -223,7 +223,8 @@ $CONFIG_SHELL, but some don't, such as `mkinstalldirs' or
Automake's
(lambda (file stat)
;; Filter out symlinks.
(eq? 'regular (stat:type stat)))
- #:stat lstat)))
+ #:stat lstat))
+ #t)
(define (patch-generated-file-shebangs . rest)
"Patch shebangs in generated files, including `SHELL' variables in
@@ -238,7 +239,9 @@ makefiles."
#:stat lstat))
;; Patch `SHELL' in generated makefiles.
- (for-each patch-makefile-SHELL (find-files "." "^(GNU)?[mM]akefile$")))
+ (for-each patch-makefile-SHELL (find-files "." "^(GNU)?[mM]akefile$"))
+
+ #t)
(define* (configure #:key build target native-inputs inputs outputs
(configure-flags '()) out-of-source?
@@ -461,7 +464,8 @@ makefiles."
(let ((sub (string-append dir "/" d)))
(and (directory-exists? sub) sub)))
strip-directories)))
- outputs))))
+ outputs)))
+ #t)
(define* (validate-runpath #:key
(validate-runpath? #t)
@@ -504,10 +508,11 @@ phase after stripping."
(filter-map (sub-directory output)
elf-directories)))
outputs)))
- (every* validate dirs))
- (begin
- (format (current-error-port) "skipping RUNPATH validation~%")
- #t)))
+ (unless (every* validate dirs)
+ (error "RUNPATH validation failed")))
+ (format (current-error-port) "skipping RUNPATH validation~%"))
+
+ #t)
(define* (validate-documentation-location #:key outputs
#:allow-other-keys)
- branch core-updates updated (5732008 -> d41ba52), Mark H. Weaver, 2018/03/16
- 03/08: gnu: acl: Use invoke instead of system*., Mark H. Weaver, 2018/03/16
- 04/08: gnu: libcap: Return #t from all phases., Mark H. Weaver, 2018/03/16
- 07/08: gnu: make-bootstrap: tarball-package: Use invoke instead of system*., Mark H. Weaver, 2018/03/16
- 01/08: build-system/gnu: Return a boolean from all phase procedures.,
Mark H. Weaver <=
- 06/08: gnu: guile-static-stripped: Use invoke instead of system*., Mark H. Weaver, 2018/03/16
- 05/08: gnu: gcc-stripped: Use invoke instead of system*., Mark H. Weaver, 2018/03/16
- 08/08: gnu: linux-libre-headers: Update to 4.14.26., Mark H. Weaver, 2018/03/16
- 02/08: gnu: autoconf-wrapper: Return #t from the builder., Mark H. Weaver, 2018/03/16