Ludovic Courtès writes: > Eric Bavier <[email protected]> skribis: > >> 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 "") > > AFAIK trailing whitespace in assignments is ignored by ‘make’. > > I grepped gobject-introspection out of curiosity and couldn’t find any > suspicious SHELL assignment. Do you still have it around?
E.g. gobject-introspection-1.38.0/giscanner/utils.py:124 > The (string=? args "\n") seems specific and non-obvious. I thought so too. Your suggestion does work. With this patch, I was able to bootstrap and build gobject-introspection.
>From 11459384968f654c42ad7dba4443dada35191f5b Mon Sep 17 00:00:00 2001 From: Eric Bavier <[email protected]> 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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/guix/build/utils.scm b/guix/build/utils.scm index f38b2ca..d169053 100644 --- a/guix/build/utils.scm +++ b/guix/build/utils.scm @@ -582,7 +582,7 @@ When KEEP-MTIME? is true, the atime/mtime of FILE are kept unchanged." (let ((st (stat file))) (substitute* file - (("^ *SHELL[[:blank:]]*=[[:blank:]]*([[:graph:]]*/)([[:graph:]]+)[[:blank:]]*(.*)$" + (("^ *SHELL[[:blank:]]*=[[:blank:]]*([[:graph:]]*/)([[:graph:]]+)(.*)$" _ dir shell args) (let* ((old (string-append dir shell)) (new (or (find-shell shell) old))) @@ -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 args)))) (when keep-mtime? (set-file-time file st)))) -- 1.7.9.5
-- Eric Bavier
