-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
I noticed that on the master branch, with bleeding edge libtool, that
running ./bootstrap altered the state of the git index. Fixed as follows:
- --
Don't work too hard, make some time for fun as well!
Eric Blake e...@byu.net
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Public key at home.comcast.net/~ericblake/eblake.gpg
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iEYEARECAAYFAko3HMoACgkQ84KuGfSFAYDhCgCgmKZCCFe+PJ3kL0As0IRMcQru
Nl4An1/KA7HKvq3NVHrFmVaUxPCmkWXL
=sBzC
-----END PGP SIGNATURE-----
>From f0a7b86de3c1a9c73cd2606566c9481be53889f1 Mon Sep 17 00:00:00 2001
From: Eric Blake <e...@byu.net>
Date: Mon, 15 Jun 2009 22:13:40 -0600
Subject: [PATCH] Document why bootstrap might touch state of tree.
* bootstrap: Fix typos. Add comment.
* HACKING: Add notes about this scenario.
* gnulib: Update to latest version.
Signed-off-by: Eric Blake <e...@byu.net>
---
ChangeLog | 5 +++++
HACKING | 10 ++++++++++
bootstrap | 9 ++++++---
gnulib | 2 +-
4 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index b4b2517..e67675f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2009-06-15 Eric Blake <e...@byu.net>
+ Document why bootstrap might touch state of tree.
+ * bootstrap: Fix typos. Add comment.
+ * HACKING: Add notes about this scenario.
+ * gnulib: Update to latest version.
+
Drop .cvsignore and redundant .gitignore files.
* .cvsignore: Delete. We are moving further away from CVS.
* build-aux/.cvsignore: Likewise.
diff --git a/HACKING b/HACKING
index ef04820..3b9c045 100644
--- a/HACKING
+++ b/HACKING
@@ -124,6 +124,14 @@ and is not part of a release distribution.
from their respective upstream source, rather than the version that
shipped with the automake release.
+* Normally, after running bootstrap, 'git status' should not show any
+ differences; if things changed, please provide a patch or at least
+ report it as a bug. One case where things are changed is if the
+ gnulib submodule comes from an older date than the current installed
+ libtool, such that libtoolize will replace the symlinks to an older
+ version of build-aux files with their newer counterpart; the fix to
+ this is updating the submodule to a newer gnulib version.
+
4. Test Suite
=============
@@ -245,6 +253,8 @@ yyyy-mm-dd Name of Author <em...@address> (tiny change)
the gnulib submodule. If necessary to update to the latest, run:
git submodule foreach git pull origin master
git commit -m 'Update gnulib submodule to latest.' gnulib
+ In particular, ensure that the gnulib version is at least as new as
+ the latest stable libtool release.
* Update the version number in configure.ac.
See http://www.gnu.org/software/libtool/contribute.html for details of
diff --git a/bootstrap b/bootstrap
index 43b55fb..c243ba3 100755
--- a/bootstrap
+++ b/bootstrap
@@ -333,11 +333,11 @@ if test -d .git && (git --version) >/dev/null 2>/dev/null
; then
if test -d "$GNULIB_SRCDIR" ; then
rmdir gnulib 2>/dev/null
git clone --reference "$GNULIB_SRCDIR" git://git.sv.gnu.org/gnulib.git \
- && git submodule init && git submodule update \
- || func_fatal_error "Unable to update gnulib"
+ && git submodule init && git submodule update \
+ || func_fatal_error "Unable to update gnulib"
else
git submodule update --init \
- || func_fatal_error "Unable to update gnulib"
+ || func_fatal_error "Unable to update gnulib"
fi
fi
else
@@ -362,6 +362,9 @@ $AUTOPOINT --force
# (or worse out-of-date) macro directory.
func_echo "running: $LIBTOOLIZE --copy --install"
${LIBTOOLIZE} --copy --install
+# Note that if libtoolize has newer auxiliary files than the current
+# gnulib submodule, then this will result in a typechange. See
+# HACKING for details.
## ---------------------- ##
## Import Gnulib modules. ##
diff --git a/gnulib b/gnulib
index abb53db..dcc2f67 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit abb53db0ac56280d00b2cb8a67f61caff622ea89
+Subproject commit dcc2f67b6ffab6e9def088ccbf7627edcda4bbac
--
1.6.3.rc3.2.g4b51
_______________________________________________
M4-patches mailing list
M4-patches@gnu.org
http://lists.gnu.org/mailman/listinfo/m4-patches
