[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bootstrap differences
From: |
Eric Blake |
Subject: |
bootstrap differences |
Date: |
Mon, 22 Feb 2010 17:25:23 -0700 |
User-agent: |
Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1.23) Gecko/20090812 Thunderbird/2.0.0.23 Mnenhy/0.7.6.666 |
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
# 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' &&
sed "s!$bt_regex/!!g" "$cp_src"
) > $cp_dst-t &&
if cmp -s "$cp_dst-t" "$cp_dst"; then
@@ -818,3 +817,7 @@
bootstrap_epilogue
echo "$0: done. Now you can run './configure'."
+
+# Local Variables:
+# indent-tabs-mode: nil
+# End:
Once that is decided, then I can merge today's changes to bootstrap into
coreutils.
--
Eric Blake address@hidden +1-801-349-2682
Libvirt virtualization library http://libvirt.org
signature.asc
Description: OpenPGP digital signature
- bootstrap differences,
Eric Blake <=