Re: Move sha1 to C?

[Paul Eggert <eggert@cs.ucla.edu>]

[Adding bug-gnulib to the CC: list.]

On 05/23/11 11:14, Leo wrote:

> I run gnulib-tool on OSX and get tons of lines such as:
> 
>   sed: 1: "/^ *unistd *$/{s/^.*$/t ...": bad flag in substitute command: '}'
>   ../gnulib/gnulib-tool: line 801: printf: write error: Broken pipe

My guess is that's due to a bit of unportable code in gnulib-tool,
which I just fixed as follows.  Could you please try it again?  If
that doesn't work, I can push the sha1 gnulib code into the Emacs
trunk myself, but I'd rather get it working for everybody.  Thanks.

---
 ChangeLog   |    8 ++++++++
 gnulib-tool |    8 ++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index de4c489..3770526 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-05-23  Paul Eggert  <eggert@cs.ucla.edu>
+
+	gnulib-tool: fix portability problem with MacOS sed
+	A sed command like "/x/{s/a/b/}" is not portable; a newline is needed
+	before the "}".  Problem reported by Leo in
+	<http://lists.gnu.org/archive/html/emacs-devel/2011-05/msg00717.html>.
+	* gnulib-tool (sed_dependencies_without_conditions):
+
 2011-05-23  Bruno Haible  <bruno@clisp.org>
 
 	getugroups: Fix module description.
diff --git a/gnulib-tool b/gnulib-tool
index f6c29f2..0bec3b3 100755
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -2694,8 +2694,12 @@ func_modules_transitive_closure ()
               func_append inmodules " $dep"
               if test -n "$cond_dependencies"; then
                 escaped_dep=`echo "$dep" | sed -e "$sed_escape_dependency"`
-                sed_extract_condition1='/^ *'"$escaped_dep"' *$/{s/^.*$/true/p}'
-                sed_extract_condition2='/^ *'"$escaped_dep"' *\[.*\] *$/{s/^ *'"$escaped_dep"' *\[\(.*\)\] *$/\1/p}'
+                sed_extract_condition1='/^ *'"$escaped_dep"' *$/{
+                  s/^.*$/true/p
+                }'
+                sed_extract_condition2='/^ *'"$escaped_dep"' *\[.*\] *$/{
+                  s/^ *'"$escaped_dep"' *\[\(.*\)\] *$/\1/p
+                }'
                 condition=`func_get_dependencies $module | sed -n -e "$sed_extract_condition1" -e "$sed_extract_condition2"`
                 if test "$condition" = true; then
                   condition=
-- 
1.7.4.4