From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39504) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eQLhZ-0002il-Bo for guix-patches@gnu.org; Sat, 16 Dec 2017 18:17:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eQLhW-0000ge-MD for guix-patches@gnu.org; Sat, 16 Dec 2017 18:17:05 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:57356) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eQLhW-0000gD-I3 for guix-patches@gnu.org; Sat, 16 Dec 2017 18:17:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1eQLhW-0006MI-Cv for guix-patches@gnu.org; Sat, 16 Dec 2017 18:17:02 -0500 Subject: [bug#29745] [PATCH 2/3] build: gnu-build-system: Return #t from phases. Resent-Message-ID: From: Arun Isaac Date: Sun, 17 Dec 2017 04:46:16 +0530 Message-Id: <20171216231617.19133-2-arunisaac@systemreboot.net> In-Reply-To: <20171216231617.19133-1-arunisaac@systemreboot.net> References: <20171216231617.19133-1-arunisaac@systemreboot.net> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 29745@debbugs.gnu.org * 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 . (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