Re: bootstrap differences

[Jim Meyering]

Eric Blake wrote:
> Should any of these bootstrap differences be synchronized?  Both coreutils
> and gnulib had some improvements over the other:
>
> $ diff -u coreutils/bootstrap coreutils/gnulib/build-aux/bootstrap
> --- coreutils/bootstrap       2010-01-01 08:29:35.453125000 -0700
> +++ coreutils/gnulib/build-aux/bootstrap      2010-02-01 07:04:53.837375000 
> -0700
> @@ -188,8 +188,8 @@
>    eval "export $find_tool_envvar"
>  }
>
> -# Find sha1sum, named gsha1sum on MacPorts.
> -find_tool SHA1SUM sha1sum gsha1sum
> +# Find sha1sum, named gsha1sum on MacPorts, and shasum on MacOS 10.6.
> +find_tool SHA1SUM sha1sum gsha1sum shasum

The added mention of "shasum" is an improvement.
coreutils needs this.

>  # Override the default configuration, if necessary.
>  # Make sure that bootstrap.conf is sourced from the current directory
> @@ -594,7 +594,6 @@
>        (
>          echo "$c1-*- buffer-read-only: t -*- vi: set ro:$c2" &&
>          echo "${c1}DO NOT EDIT! GENERATED AUTOMATICALLY!$c2" &&
> -        echo '#line 1' &&

The use of "#line 1" in coreutils is not worth keeping.
At first I thought it would be, but in practice it just causes trouble,
at least for me, via the off-by-3 line numbers in failed assertions.

> +# Local Variables:
> +# indent-tabs-mode: nil
> +# End:

These lines (in gnulib's copy) are no longer needed,
now that we have an indent-with-spaces policy.
They predate gnulib's global change.

> Once that is decided, then I can merge today's changes to bootstrap into
> coreutils.

Thanks!