guix-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[bug#29745] [PATCH 2/3] build: gnu-build-system: Return #t from phases.


From: Arun Isaac
Subject: [bug#29745] [PATCH 2/3] build: gnu-build-system: Return #t from phases.
Date: Sun, 17 Dec 2017 04:46:16 +0530

* guix/build/gnu-build-system.scm (patch-usr-bin-file, patch-source-shebangs,
patch-generated-file-shebangs, strip): Return #t from phases.
---
 guix/build/gnu-build-system.scm | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/guix/build/gnu-build-system.scm b/guix/build/gnu-build-system.scm
index e1653a395..92fa4f5fa 100644
--- a/guix/build/gnu-build-system.scm
+++ b/guix/build/gnu-build-system.scm
@@ -157,7 +157,8 @@ working directory."
       (and (if (string-suffix? ".zip" source)
                (zero? (system* "unzip" source))
                (zero? (system* "tar" "xvf" source)))
-           (chdir (first-subdirectory ".")))))
+           (chdir (first-subdirectory "."))
+           #t)))
 
 ;; See <http://bugs.gnu.org/17840>.
 (define* (patch-usr-bin-file #:key native-inputs inputs
@@ -184,7 +185,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
@@ -199,7 +201,8 @@ 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?
@@ -413,7 +416,8 @@ makefiles."
                             ;; Ignore symlinks such as:
                             ;; libfoo.so -> libfoo.so.0.0.
                             (eq? 'regular (stat:type stat)))
-                          #:stat lstat)))
+                          #:stat lstat))
+    #t)
 
   (or (not strip-binaries?)
       (every strip-dir
-- 
2.15.1






reply via email to

[Prev in Thread] Current Thread [Next in Thread]