On 08/09/2013 03:23 AM, Mike Miller wrote:
> (Pruning the cc list of leftovers from the Savannah bug tracker)
>
> Hi Pádraig,
>
> On Thu, Aug 8, 2013 at 11:08:23 +0100, Pádraig Brady wrote:
>> On 08/08/2013 03:59 AM, Mike Miller wrote:
>>> [...]
>>> You can certainly follow up with gnulib upstream if you want them to
>>> consider
>>> using OpenBSD's sha1 instead of gsha1sum, but the bootstrap script currently
>>> uses the --status option that is GNU-specific.
>>
>> This adjustment should avoid the need for coreutils
>> (there might be a catch 22 with that requirement).
>> You'll also need to export SHA1SUM=sha1 before running bootstrap.
>> [...]
>
> Thanks for the suggestion. I did try SHA1SUM=sha1, but that still
> won't work with bootstrap since find_tool() requires that $tool
> understand the --version option. That was mentioned earlier in the bug
> report linked above.
Oh that's a bit of a buglet then, as --version isn't required
unless a version is specified in the requirements.
Does SHA1SUM=sha1 work after applying...
commit 2c519cd635d46d314cd991b1a011464f7345c5fa
Author: Pádraig Brady <p...@draigbrady.com>
Date: Thu Aug 8 11:08:49 2013 +0100
bootstrap: support checksum utils having -c but not --status
* build-aux/bootstrap (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.
One only has to define the SHA1SUM env var to select an
appropriate tool, like sha1 on the BSDs for example.
(find_tool): Remove the check for --version support as this
is optional as per commit 86186b17
diff --git a/build-aux/bootstrap b/build-aux/bootstrap
index 9c52204..4428478 100755
--- a/build-aux/bootstrap
+++ b/build-aux/bootstrap
@@ -231,13 +231,9 @@ find_tool ()
break
fi
done
- else
- find_tool_error_prefix="\$$find_tool_envvar: "
fi
test x"$find_tool_res" != x \
|| die "one of these is required: $find_tool_names"
- ($find_tool_res --version </dev/null) >/dev/null 2>&1 \
- || die "${find_tool_error_prefix}cannot run $find_tool_res --version"
eval "$find_tool_envvar=\$find_tool_res"
eval "export $find_tool_envvar"
}
@@ -692,8 +688,7 @@ update_po_files() {
cksum_file="$ref_po_dir/$po.s1"
if ! test -f "$cksum_file" ||
! test -f "$po_dir/$po.po" ||
- ! $SHA1SUM -c --status "$cksum_file" \
- < "$new_po" > /dev/null; then
+ ! $SHA1SUM -c "$cksum_file" < "$new_po" > /dev/null 2>&1; then
echo "$me: updated $po_dir/$po.po..."
cp "$new_po" "$po_dir/$po.po" \
&& $SHA1SUM < "$new_po" > "$cksum_file"
