From 541943ee04ee22101bbbde2386272b1cad635132 Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Sun, 6 Sep 2020 10:08:22 +0200 Subject: [PATCH 1/7] build: fix a concurrent build issue in examples Reported by Thomas Deutschmann . https://lists.gnu.org/r/bug-bison/2020-09/msg00010.html * examples/c/lexcalc/local.mk: scan.o depends on parse.[ch]. --- examples/c/lexcalc/local.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/examples/c/lexcalc/local.mk b/examples/c/lexcalc/local.mk index b73887e2..636275c8 100644 --- a/examples/c/lexcalc/local.mk +++ b/examples/c/lexcalc/local.mk @@ -31,6 +31,13 @@ endif FLEX_WORKS %D%/parse.c: $(dependencies) +# Tell Make scan.o depends on parse.h, except that Make sees only +# parse.c, not parse.h. We can't use BUILT_SOURCES to this end, since +# we use the built bison. +%D%/lexcalc$(DASH)scan.o: %D%/parse.c +# Likewise, but for Automake before 1.16. +%D%/examples_c_lexcalc_lexcalc$(DASH)scan.o: %D%/parse.c + EXTRA_DIST += %D%/lexcalc.test dist_lexcalc_DATA = %D%/parse.y %D%/scan.l %D%/Makefile %D%/README.md CLEANFILES += %D%/parse.[ch] %D%/scan.c %D%/parse.output From c08e0863be8743fa5a335a615de9a857afbd1544 Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Sat, 26 Sep 2020 14:32:25 +0200 Subject: [PATCH 2/7] glr.cc: fix: use symbol_name * data/skeletons/glr.cc: here. --- data/skeletons/glr.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/skeletons/glr.cc b/data/skeletons/glr.cc index 56279f42..8ba34fc2 100644 --- a/data/skeletons/glr.cc +++ b/data/skeletons/glr.cc @@ -172,7 +172,7 @@ m4_pushdef([b4_parse_param], m4_defn([b4_parse_param_orig]))dnl const location_type* yylocationp]])[) const { *yycdebug_ << (yykind < YYNTOKENS ? "token" : "nterm") - << ' ' << yytname[yykind] << " ("]b4_locations_if([[ + << ' ' << yysymbol_name (yykind) << " ("]b4_locations_if([[ << *yylocationp << ": "]])[; yy_symbol_value_print_ (yykind, yyvaluep]b4_locations_if([[, yylocationp]])[); *yycdebug_ << ')'; From 567d1eaa1955c0043830d67e2f432f3942dc4a92 Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Tue, 13 Oct 2020 06:46:06 +0200 Subject: [PATCH 3/7] gnulib: update --- gnulib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnulib b/gnulib index a83f488b..160d5e7d 160000 --- a/gnulib +++ b/gnulib @@ -1 +1 @@ -Subproject commit a83f488ba4eb1ce8fd072bf087e87aca6ab1ee79 +Subproject commit 160d5e7d9a64a29a52d4821fd0ef2136d7e2102a From bc5e4541dab3c7be22574d398a295dd94632614f Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Tue, 13 Oct 2020 06:56:01 +0200 Subject: [PATCH 4/7] build: don't link bison against libreadline Reported by Paul Smith . https://lists.gnu.org/r/bug-bison/2020-10/msg00001.html * src/local.mk (src_bison_LDADD): here. --- NEWS | 7 +++++++ src/local.mk | 1 - 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index a10af6f7..7af5b8dc 100644 --- a/NEWS +++ b/NEWS @@ -2,6 +2,13 @@ GNU Bison NEWS * Noteworthy changes in release ?.? (????-??-??) [?] +** Bug fixes + + Fix concurrent build issues. + + The bison executable is no longer linked uselessly against libreadline. + + Fix incorrect use of yytname in glr.cc. * Noteworthy changes in release 3.7.2 (2020-09-05) [stable] diff --git a/src/local.mk b/src/local.mk index 76808906..32d09d10 100644 --- a/src/local.mk +++ b/src/local.mk @@ -143,7 +143,6 @@ src_bison_LDADD = \ $(LIB_SETLOCALE_NULL) \ $(LIBICONV) \ $(LIBINTL) \ - $(LIBREADLINE) \ $(LIBTEXTSTYLE) From 5d501ee72871d36201edde56aa6b4084604b844f Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Tue, 13 Oct 2020 07:01:24 +0200 Subject: [PATCH 5/7] version 3.7.3 * NEWS: Record release date. --- NEWS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 7af5b8dc..e2dc1550 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,6 @@ GNU Bison NEWS -* Noteworthy changes in release ?.? (????-??-??) [?] +* Noteworthy changes in release 3.7.3 (2020-10-13) [stable] ** Bug fixes From a15879c62300c534c6553196d30656363dc20a75 Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Tue, 13 Oct 2020 07:23:28 +0200 Subject: [PATCH 6/7] maint: post-release administrivia * NEWS: Add header line for next release. * .prev-version: Record previous version. * cfg.mk (old_NEWS_hash): Auto-update. --- .prev-version | 2 +- NEWS | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.prev-version b/.prev-version index 0b2eb36f..c1e43e6d 100644 --- a/.prev-version +++ b/.prev-version @@ -1 +1 @@ -3.7.2 +3.7.3 diff --git a/NEWS b/NEWS index e2dc1550..32671d01 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,8 @@ GNU Bison NEWS +* Noteworthy changes in release ?.? (????-??-??) [?] + + * Noteworthy changes in release 3.7.3 (2020-10-13) [stable] ** Bug fixes From 3cba59dd7f8032f59846cf166c8fa97a22f4e49c Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Wed, 14 Oct 2020 21:12:04 +0200 Subject: [PATCH 7/7] doc: fix typo * README: here. --- README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README b/README index 794d49e4..94f8a4f8 100644 --- a/README +++ b/README @@ -27,7 +27,7 @@ Bison from the git repo. Roughly, run: then proceed with the usual `configure && make` steps. ## Build from tarball -See the [INSTALL file](INSTALL] for generic compilation and installation +See the [INSTALL file](INSTALL) for generic compilation and installation instructions. Bison requires GNU m4 1.4.6 or later. See