From 049be0146e67fa9fde5c97ae87f4575752199649 Mon Sep 17 00:00:00 2001 From: "Gary V. Vaughan" Date: Fri, 23 Aug 2013 19:55:27 +0700 Subject: [PATCH] bootstrap: support sha1 binary on OpenBSD. * gl/build-aux/bootstrap.in (func_update_po_files): Remove the use of --status in a way that will suppress all error messages, but since this is only used to minimize updates, it shouldn't cause an issue. Look for a sha1 binary if the other SHA1SUM settings are not found. Also exit early if there is a problem updating the po file checksums. * bootstrap: Regenerate. Ported from a gnulib patch by Padraig Brady. Signed-off-by: Gary V. Vaughan --- gl/build-aux/bootstrap.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gl/build-aux/bootstrap.in b/gl/build-aux/bootstrap.in index 8678d062b..b2291be46 100755 --- a/gl/build-aux/bootstrap.in +++ b/gl/build-aux/bootstrap.in @@ -2435,7 +2435,7 @@ func_update_po_files () |$SED -e 's|.*/||' -e 's|\.po$||' > "$_G_po_dir/LINGUAS" || return # Find sha1sum, named gsha1sum on MacPorts, and shasum on MacOS 10.6+. - func_find_tool SHA1SUM sha1sum gsha1sum shasum + func_find_tool SHA1SUM sha1sum gsha1sum shasum sha1 _G_langs=`cd $_G_ref_po_dir && echo *.po|$SED 's|\.po||g'` test '*' = "$_G_langs" && _G_langs=x @@ -2445,11 +2445,11 @@ func_update_po_files () _G_cksum_file=$_G_ref_po_dir/$_G_po.s1 if ! test -f "$_G_cksum_file" || ! test -f "$_G_po_dir/$_G_po.po" || - ! $SHA1SUM -c --status "$_G_cksum_file" \ + ! $SHA1SUM -c "$_G_cksum_file" \ < "$_G_new_po" > /dev/null; then echo "updated $_G_po_dir/$_G_po.po..." cp "$_G_new_po" "$_G_po_dir/$_G_po.po" \ - && $SHA1SUM < "$_G_new_po" > "$_G_cksum_file" + && $SHA1SUM < "$_G_new_po" > "$_G_cksum_file" || return fi done } -- 2.47.3