On Mon, 11 Oct 2010, Joel E. Denny wrote: > I'll plan some time this coming weekend to get 2.5 going again.
I cherry-picked from master to branch-2.5 as follows. commit 32dc877a20aba67d3df6bf9dafdb75850073733c Author: Paul Eggert <[email protected]> Date: Fri Oct 8 11:03:04 2010 -0700 Sync from upstream gnulib and autoconf. (cherry picked from commit 771a7fb869219992c78dfd4ee651da07fb937323) commit 86996fca101c629ef197313a1058df26e01df950 Author: Paul Eggert <[email protected]> Date: Fri Oct 8 11:10:06 2010 -0700 Adjust to recent changes to gnulib bootstrap. * .cvsignore, build-aux/.cvsignore, doc/.cvsignore, etc/.cvsignore: * examples/calc++/.cvsignore, lib/.cvsignore, m4/.cvsignore: * po/.cvsignore, runtime-po/.cvsignore, src/.cvsignore: * tests/.cvsignore: Remove; I don't use CVS to maintain Bison anymore and don't know of anybody else who does. If someone needs these files, they can resurrect them. * .gitignore, build-aux/.gitignore, doc/.gitignore, lib/.gitignore: * m4/.gitignore, po/.gitignore, runtime-po/.gitignore: Omit leading '/', since bootstrap omits it. Adjust file names to match current contents better. * bootstrap: Sync from gnulib: this contains the new gnulib_mk_hook installed just for us. * bootstrap.conf (excluded_files): Don't exclude codeset.m4, glibc21.m4, inttypes_h.m4, size_max.m4, xsize.m4, as they are now needed somehow. Don't have time to look into why. (gnulib_modules): Change malloc to malloc-gnu. Do we really assume the GNU malloc behavior, where malloc (0) != NULL unless we're out of storage? If not, we can omit malloc-gnu; but for now I left it in to be safe. (vc_ignore): Remove. * README-hacking: Renamed from HACKING, since gnulib bootstrap now uses that convention. (cherry picked from commit 95aed8db15a0bb0f7819bf77586d0cf6812ffdfd) Conflicts: bootstrap build-aux/.cvsignore build-aux/.gitignore doc/.cvsignore doc/.gitignore etc/.cvsignore m4/.cvsignore m4/.gitignore src/.cvsignore src/.gitignore tests/.cvsignore commit ea6046b9f6f8ab16f2f0f03a0d15499243971ae2 Author: Paul Eggert <[email protected]> Date: Fri Oct 8 12:12:48 2010 -0700 Fix portability problem on OpenBSD 4.7. Jim Meyering reported this in <http://lists.gnu.org/archive/html/bug-bison/2010-10/msg00007.html>. * data/yacc.c: Use EXIT_SUCCESS as a witness for stdlib.h, not _STDLIB_H. EXIT_SUCCESS has been defined by the standard for quite some time. * src/parse-gram.c, src/parse-gram.h: Regenerate. * tests/regression.at: Tamper with the renamed witness. (cherry picked from commit 8ff146cd31d887f9bb28ec5f96bffcad4b4057f7) Conflicts: ChangeLog src/parse-gram.c src/parse-gram.h commit 2f3fd8f9861f886d1359e4eb5535b3b6ae97a859 Author: Joel E. Denny <[email protected]> Date: Sun Oct 17 10:18:26 2010 -0400 maint: re-anchor all .gitignore entries. * bootstrap: Copy from gnulib's latest for the fix to automatically anchor entries it constructs. * gnulib: Update to latest just so it has the same bootstrap. * .gitignore, build-aux/.gitignore, doc/.gitignore: * lib/.gitignore, m4/.gitignore, po/.gitignore: * runtime-po/.gitignore: Re-anchor all entries. (cherry picked from commit e503b9cbbebde5e0ecccdcc864969b9a609b940d) Conflicts: build-aux/.gitignore doc/.gitignore src/.gitignore
