diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2020-04-16 10:12:30 +0200 |
|---|---|---|
| committer | Nick Alcock <nick.alcock@oracle.com> | 2021-02-10 15:26:56 +0000 |
| commit | 830c5a1ffb0ee5f064b0ba0b07cb111aa7f85141 (patch) | |
| tree | f81621bb4c7ef99b3c7477966c6f01638d39dc89 /intl/configure.ac | |
| parent | a52d653e9170d361e354ddaf2876aaa09aece207 (diff) | |
| download | gdb-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/configure.ac')
| -rw-r--r-- | intl/configure.ac | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/intl/configure.ac b/intl/configure.ac index 48832b9..b110337 100644 --- a/intl/configure.ac +++ b/intl/configure.ac @@ -47,5 +47,28 @@ case $USE_INCLUDED_LIBINTL in ;; esac +BISON3_YES='#' +BISON3_NO= +if test "$INTLBISON" != :; then + ac_bison3=no + AC_MSG_CHECKING([bison 3 or later]) +changequote(<<,>>)dnl + ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'` + case $ac_prog_version in + [3-9].*) +changequote([,])dnl + ac_prog_version="$ac_prog_version, bison3"; ac_bison3=yes;; + *) ac_prog_version="$ac_prog_version, old";; + esac + AC_MSG_RESULT([$ac_prog_version]) + if test $ac_bison3 = yes; then + AC_DEFINE(HAVE_BISON3, 1, [Define if bison 3 or later is used.]) + BISON3_YES= + BISON3_NO='#' + fi +fi +AC_SUBST(BISON3_YES) +AC_SUBST(BISON3_NO) + AC_CONFIG_FILES(Makefile config.intl) AC_OUTPUT |