From mboxrd@z Thu Jan 1 00:00:00 1970 From: Eric Bavier Subject: [PATCH] utils: Clean trailing whitespace at end of SHELL Date: Thu, 04 Sep 2014 09:27:11 -0500 Message-ID: <87bnqv31hc.fsf@member.fsf.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:53420) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XPY0O-00021j-C3 for guix-devel@gnu.org; Thu, 04 Sep 2014 10:27:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XPY0F-0003NI-1E for guix-devel@gnu.org; Thu, 04 Sep 2014 10:27:20 -0400 Received: from mail-ie0-x22a.google.com ([2607:f8b0:4001:c03::22a]:47687) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XPY0E-0003NB-S0 for guix-devel@gnu.org; Thu, 04 Sep 2014 10:27:10 -0400 Received: by mail-ie0-f170.google.com with SMTP id rl12so11821377iec.29 for ; Thu, 04 Sep 2014 07:27:10 -0700 (PDT) Received: from cooper.gmail.com (chippewa-nat.cray.com. [136.162.34.1]) by mx.google.com with ESMTPSA id j2sm1035840igm.21.2014.09.04.07.27.08 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 04 Sep 2014 07:27:09 -0700 (PDT) List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: guix-devel@gnu.org --=-=-= I found an unfortunate bug in the last patch I made to patch-makefile-SHELL that would leave a trailing ' ' at the end of SHELL assignments. This is fine for most packages, but caused gobject-introspection to fail building for me just now (for the curious: it effectively does an "(apply system* (string-split (string-append SHELL " " "./libtool") #\space))" which causes sh to try to execute "") The attached patch to core-updates should remedy the problem. --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-utils-Clean-trailing-whitespace-at-end-of-SHELL.patch >From c2467a4504737c13435304b1e5c7eb7e4ebf7b70 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Thu, 4 Sep 2014 09:19:24 -0500 Subject: [PATCH] utils: Clean trailing whitespace at end of SHELL * guix/build/utils.scm (patch-makefile-SHELL): Remove trailing whitespace. --- guix/build/utils.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guix/build/utils.scm b/guix/build/utils.scm index f38b2ca..d6365c0 100644 --- a/guix/build/utils.scm +++ b/guix/build/utils.scm @@ -590,7 +590,7 @@ When KEEP-MTIME? is true, the atime/mtime of FILE are kept unchanged." (format (current-error-port) "patch-makefile-SHELL: ~a: changing `SHELL' from `~a' to `~a'~%" file old new)) - (string-append "SHELL = " new " " args)))) + (string-append "SHELL = " new (if (string=? args "\n") "" " ") args)))) (when keep-mtime? (set-file-time file st)))) -- 1.7.9.5 --=-=-= -- Eric Bavier --=-=-=--