aboutsummaryrefslogtreecommitdiff
path: root/intl/config.h.in
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2020-04-16 10:12:30 +0200
committerNick Alcock <nick.alcock@oracle.com>2021-02-10 15:26:56 +0000
commit830c5a1ffb0ee5f064b0ba0b07cb111aa7f85141 (patch)
treef81621bb4c7ef99b3c7477966c6f01638d39dc89 /intl/config.h.in
parenta52d653e9170d361e354ddaf2876aaa09aece207 (diff)
downloadgdb-830c5a1ffb0ee5f064b0ba0b07cb111aa7f85141.zip
gdb-830c5a1ffb0ee5f064b0ba0b07cb111aa7f85141.tar.gz
gdb-830c5a1ffb0ee5f064b0ba0b07cb111aa7f85141.tar.bz2
intl: Allow building both with old bison and bison >= 3 [PR92008]
bison 3 apparently made a backwards incompatible change, dropped YYLEX_PARAM/YYPARSE_PARAM support and instead needs %param or %lex-param and %parse-param. Furthermore, there is no easy way to conditionalize on bison version in the *.y files. While e.g. glibc bumped bison requirement and just has the bison 3 compatible version, Richi said there are still systems with older bison where we want to build gcc. So, this patch instead determines during configure bison version, and depending on that when building plural.c (if building it at all) tweaks what is passed over to bison if needed. Tested with both bison 3 and bison 1.35, in each case with reconfiguring intl and building with make all-yes (as in my setup intl isn't normally used). intl/ChangeLog 2020-04-16 Jakub Jelinek <jakub@redhat.com> PR bootstrap/92008 * configure.ac: Add check for bison >= 3, AC_DEFINE HAVE_BISON3 and AC_SUBST BISON3_YES and BISON3_NO. * Makefile.in (.y.c): Prefix $(YACC) invocation with @BISON3_NO@, add @BISON3_YES@ prefixed rule to adjust the *.y source using sed and adjust output afterwards. * plural-exp.h (PLURAL_PARSE): If HAVE_BISON3 is defined, use struct parse_args * type for arg instead of void *. * plural.y: Add magic /* BISON3 ... */ comments with bison >= 3 directives. (YYLEX_PARAM, YYPARSE_PARAM): Don't define if HAVE_BISON3 is defined. (yylex, yyerror): Adjust prototypes and definitions if HAVE_BISON3 is defined. * plural.c: Regenerated. * config.h.in: Regenerated. * configure: Regenerated.
Diffstat (limited to 'intl/config.h.in')
-rw-r--r--intl/config.h.in3
1 files changed, 3 insertions, 0 deletions
diff --git a/intl/config.h.in b/intl/config.h.in
index 9c9b53d..87738c0 100644
--- a/intl/config.h.in
+++ b/intl/config.h.in
@@ -28,6 +28,9 @@
/* Define to 1 if you have the <argz.h> header file. */
#undef HAVE_ARGZ_H
+/* Define if bison 3 or later is used. */
+#undef HAVE_BISON3
+
/* Define if the GNU dcgettext() function is already present or preinstalled.
*/
#undef HAVE_DCGETTEXT