From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Paul Eggert Newsgroups: gmane.emacs.devel,gmane.comp.lib.gnulib.bugs Subject: Re: Move sha1 to C? Date: Mon, 23 May 2011 15:10:47 -0700 Organization: UCLA Computer Science Department Message-ID: <4DDADB67.1090904@cs.ucla.edu> References: NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-Trace: dough.gmane.org 1306188669 9105 80.91.229.12 (23 May 2011 22:11:09 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Mon, 23 May 2011 22:11:09 +0000 (UTC) Cc: Bug-gnulib , Stefan Monnier , emacs-devel@gnu.org To: Leo Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue May 24 00:11:04 2011 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([140.186.70.17]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1QOdL4-00015G-Hz for ged-emacs-devel@m.gmane.org; Tue, 24 May 2011 00:11:02 +0200 Original-Received: from localhost ([::1]:44244 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QOdL3-00039P-Qr for ged-emacs-devel@m.gmane.org; Mon, 23 May 2011 18:11:01 -0400 Original-Received: from eggs.gnu.org ([140.186.70.92]:38121) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QOdKw-000311-Uw for emacs-devel@gnu.org; Mon, 23 May 2011 18:10:55 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QOdKv-0008VM-SO for emacs-devel@gnu.org; Mon, 23 May 2011 18:10:54 -0400 Original-Received: from smtp.cs.ucla.edu ([131.179.128.62]:43235) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QOdKt-0008IE-4Q; Mon, 23 May 2011 18:10:51 -0400 Original-Received: from localhost (localhost.localdomain [127.0.0.1]) by smtp.cs.ucla.edu (Postfix) with ESMTP id 3224D39E8113; Mon, 23 May 2011 15:10:49 -0700 (PDT) X-Virus-Scanned: amavisd-new at smtp.cs.ucla.edu Original-Received: from smtp.cs.ucla.edu ([127.0.0.1]) by localhost (smtp.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id RRlEC6EbFWoK; Mon, 23 May 2011 15:10:48 -0700 (PDT) Original-Received: from [131.179.64.200] (Penguin.CS.UCLA.EDU [131.179.64.200]) by smtp.cs.ucla.edu (Postfix) with ESMTPSA id 30FFE39E810E; Mon, 23 May 2011 15:10:48 -0700 (PDT) User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.17) Gecko/20110428 Fedora/3.1.10-1.fc14 Thunderbird/3.1.10 In-Reply-To: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 131.179.128.62 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:139666 gmane.comp.lib.gnulib.bugs:26788 Archived-At: [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 + + 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 + . + * gnulib-tool (sed_dependencies_without_conditions): + 2011-05-23 Bruno Haible 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