From: Joel E. Denny Date: Tue, 23 Mar 2010 15:42:30 +0000 (-0400) Subject: portability: fix spawning on at least FreeBSD 8 and FreeBSD 9. X-Git-Tag: v2.7.90~711 X-Git-Url: https://git.saurik.com/bison.git/commitdiff_plain/8b9e021fd1e3b03568d4b2167c47f33ba822a1c8 portability: fix spawning on at least FreeBSD 8 and FreeBSD 9. Reported by Johan van Selst at . * NEWS (2.4.3): New. * THANKS (Johan van Selst): Add. * etc/prefix-gnulib-mk (prefix): Adjust regex for makefile targets so that gnulib's new c++defs.h is matched. * gnulib: Update to latest. (cherry picked from commit 311b2e56eaad952fc7908336e3aeb019dd8bf1ee) Conflicts: NEWS --- diff --git a/ChangeLog b/ChangeLog index 9e8359e8..15f76f8c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2010-03-23 Joel E. Denny + + portability: fix spawning on at least FreeBSD 8 and FreeBSD 9. + Reported by Johan van Selst at + . + * NEWS (2.4.3): New. + * THANKS (Johan van Selst): Add. + * etc/prefix-gnulib-mk (prefix): Adjust regex for makefile + targets so that gnulib's new c++defs.h is matched. + * gnulib: Update to latest. + 2010-03-20 Joel E. Denny maint: update for changes to gnulib's announce-gen. diff --git a/NEWS b/NEWS index fa7d9770..814a3b57 100644 --- a/NEWS +++ b/NEWS @@ -236,6 +236,11 @@ Bison News determine which destructor to call for the lookahead upon a syntax error or upon parser return. This bug has been fixed. +* Changes in version 2.4.3 (????-??-??): + +** Problems with spawning M4 on at least FreeBSD 8 and FreeBSD 9 have + been fixed. + * Changes in version 2.4.2 (2010-03-20): ** Some portability problems that resulted in failures and livelocks diff --git a/THANKS b/THANKS index e1628bef..a417bbc0 100644 --- a/THANKS +++ b/THANKS @@ -47,6 +47,7 @@ Jesse Thilo jthilo@gnu.org Jim Kent jkent@arch.sel.sony.com Jim Meyering jim@meyering.net Joel E. Denny jdenny@ces.clemson.edu +Johan van Selst johans@stack.nl Jonathan Nieder jrnieder@gmail.com Juan Manuel Guerrero juan.guerrero@gmx.de Kees Zeelenberg kzlg@users.sourceforge.net diff --git a/build-aux/.cvsignore b/build-aux/.cvsignore index ecf16927..c059417a 100644 --- a/build-aux/.cvsignore +++ b/build-aux/.cvsignore @@ -1,5 +1,6 @@ announce-gen arg-nonnull.h +c++defs.h compile config.guess config.rpath diff --git a/build-aux/.gitignore b/build-aux/.gitignore index c909f72b..af528906 100644 --- a/build-aux/.gitignore +++ b/build-aux/.gitignore @@ -1,5 +1,6 @@ /announce-gen /arg-nonnull.h +/c++defs.h /compile /config.guess /config.rpath diff --git a/etc/prefix-gnulib-mk b/etc/prefix-gnulib-mk index 1bff69bc..56dfd497 100755 --- a/etc/prefix-gnulib-mk +++ b/etc/prefix-gnulib-mk @@ -90,7 +90,7 @@ sub prefix ($) # Prefix all the occurrence of files in rules. If there is nothing # after in the :, it's probably a phony target, or a suffix rule. # Don't touch it. - s{^([-\w/]+\.[-\w.]+ *: *\S.*)$} + s{^([-\w+/]+\.[-\w.]+ *: *\S.*)$} {prefix_words($1)}gem; # Prefix files in variables. diff --git a/gnulib b/gnulib index 9d0ad652..7bacd338 160000 --- a/gnulib +++ b/gnulib @@ -1 +1 @@ -Subproject commit 9d0ad652de159d08e5f679842f8a2a5658196361 +Subproject commit 7bacd338464a463f3ba0c14effd86b71ce3672b4 diff --git a/m4/.cvsignore b/m4/.cvsignore index 23153051..1bceef2f 100644 --- a/m4/.cvsignore +++ b/m4/.cvsignore @@ -131,8 +131,10 @@ warn-on-use.m4 warning.m4 warnings.m4 wchar.m4 +wchar_h.m4 wchar_t.m4 wctype.m4 +wctype_h.m4 wcwidth.m4 wint_t.m4 xalloc.m4 diff --git a/m4/.gitignore b/m4/.gitignore index 7ff1d99e..0f51068b 100644 --- a/m4/.gitignore +++ b/m4/.gitignore @@ -131,8 +131,10 @@ /warning.m4 /warnings.m4 /wchar.m4 +/wchar_h.m4 /wchar_t.m4 /wctype.m4 +/wctype_h.m4 /wcwidth.m4 /wint_t.m4 /xalloc.m4