This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "GNU M4 source repository".
http://git.sv.gnu.org/gitweb/?p=m4.git;a=commitdiff;h=11199a26f8d5d69a8a748e63f94e59f718278515 The branch, branch-1.4 has been updated via 11199a26f8d5d69a8a748e63f94e59f718278515 (commit) via 6b459f609114e1ff3777d3b455a960c1543de3b3 (commit) from bb213870593b17fa7501413334053e85cd58e062 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 11199a26f8d5d69a8a748e63f94e59f718278515 Author: Eric Blake <[email protected]> Date: Sat Mar 9 18:04:59 2013 -0700 build: fix large diversions on mingw Gnulib's clean-temp module defaults to using _O_TEMPORARY on mingw, which has the effect of deleting a file the first time it is closed. This resulted in a testsuite failure in 146.diversions, with m4 complaining that it could not create a temporary file for holding a diversion. In reality, m4 was trying to rename the file, but because mingw does not allow renaming an open file, we have to close it first - but closing it first deleted the file. For now, we will just work around the gnulib issue by disabling the use of _O_TEMPORARY. This was probably introduced in commit da5f6db (1.4.13), although my testing environment was painfully slow to confirm this, so I did not call out a 'regression since xyz' in the NEWS entry. * gl/lib/clean-temp.c.diff: New file. Signed-off-by: Eric Blake <[email protected]> commit 6b459f609114e1ff3777d3b455a960c1543de3b3 Author: Eric Blake <[email protected]> Date: Mon Mar 11 07:59:06 2013 -0600 Revert "bootstrap: require newer texinfo release." This reverts commit bb213870593b17fa7501413334053e85cd58e062. Instead, update to the latest gnulib, where gendocs.sh has been patched to no longer require makeinfo 5.0. * bootstrap.conf: Relax makeinfo requirement. * gnulib: Update to latest, for gendocs.sh fix. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 8 ++++---- NEWS | 3 +++ bootstrap.conf | 2 +- gl/lib/clean-temp.c.diff | 14 ++++++++++++++ gnulib | 2 +- 5 files changed, 23 insertions(+), 6 deletions(-) create mode 100644 gl/lib/clean-temp.c.diff diff --git a/ChangeLog b/ChangeLog index bde099a..3e08dba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,8 @@ -2013-03-08 Gary V. Vaughan <[email protected]> +2013-03-11 Eric Blake <[email protected]> - bootstrap: require newer texinfo release. - * bootstrap.conf (buildreq): Bump required makeinfo binary - release number to 5.0 to support --build-dir option. + build: fix large diversions on mingw + * gl/lib/clean-temp.c.diff: New file. + * NEWS: Mention the fix. 2013-03-08 Gary V. Vaughan <[email protected]> diff --git a/NEWS b/NEWS index 25c12ea..2240772 100644 --- a/NEWS +++ b/NEWS @@ -4,6 +4,9 @@ GNU M4 NEWS - User visible changes. ** Fix compilation with newer glibc headers. +** Fix a failure with diverting large amounts of text on mingw (does + not affect platforms that can rename an open file). + ** A number of portability improvements inherited from gnulib. diff --git a/bootstrap.conf b/bootstrap.conf index bba6148..b267d16 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -27,7 +27,7 @@ # and release Libtool. buildreq=' help2man 1.29 http://www.gnu.org/s/help2man - makeinfo 5.0 http://www.gnu.org/s/texinfo + makeinfo 4.8 http://www.gnu.org/s/texinfo xz - http://tukaani.org/xz ' diff --git a/gl/lib/clean-temp.c.diff b/gl/lib/clean-temp.c.diff new file mode 100644 index 0000000..2eafde6 --- /dev/null +++ b/gl/lib/clean-temp.c.diff @@ -0,0 +1,14 @@ +diff --git i/lib/clean-temp.c w/lib/clean-temp.c +index 40ec02f..1053312 100644 +--- i/lib/clean-temp.c ++++ w/lib/clean-temp.c +@@ -582,6 +582,9 @@ static bool + supports_delete_on_close () + { + static int known; /* 1 = yes, -1 = no, 0 = unknown */ ++ /* M4 wants to close and later reopen a temporary file, so ++ delete-on-close must not be used. */ ++ known = -1; + if (!known) + { + OSVERSIONINFO v; diff --git a/gnulib b/gnulib index 951e33a..162b3eb 160000 --- a/gnulib +++ b/gnulib @@ -1 +1 @@ -Subproject commit 951e33a41cce0f553befee73311ac0af188ef239 +Subproject commit 162b3eb8ff8eca18d7c6cfbe3a4b98aa4e5972ce hooks/post-receive -- GNU M4 source repository
