diff options
| author | Tim-Philipp Müller <tim@centricular.com> | 2019-12-03 10:40:37 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.com> | 2019-12-03 10:40:44 +0000 |
| commit | 710542847035f87c6a07852ba252daa486b03bac (patch) | |
| tree | cfc387855683e05aed0057f8a4a76f2f2116f999 | |
| parent | ebd0d664d4a620f1c3f27a40cee63265e40e05c4 (diff) | |
| download | gstreamer-710542847035f87c6a07852ba252daa486b03bac.tar.gz | |
Revert "gst/parse: define pure-parser depending on bison version"
This reverts commit 77141834bb5d124fb5781ed3be6230cc66cb42de.
This breaks the autotools build and it seems too much effort to
fix that up just to fix a bison warning.
| -rw-r--r-- | gst/parse/grammar.y (renamed from gst/parse/grammar.y.in) | 2 | ||||
| -rw-r--r-- | gst/parse/meson.build | 11 |
2 files changed, 2 insertions, 11 deletions
diff --git a/gst/parse/grammar.y.in b/gst/parse/grammar.y index 034232499f..1aa77edb39 100644 --- a/gst/parse/grammar.y.in +++ b/gst/parse/grammar.y @@ -796,7 +796,7 @@ static int yyerror (void *scanner, graph_t *graph, const char *s); %lex-param { void *scanner } %parse-param { void *scanner } %parse-param { graph_t *graph } -@BISON_PURE_PARSER@ +%pure-parser %start graph %% diff --git a/gst/parse/meson.build b/gst/parse/meson.build index 35ed6f2f40..a843398135 100644 --- a/gst/parse/meson.build +++ b/gst/parse/meson.build @@ -27,7 +27,6 @@ gen_lex = configure_file(input : 'gen_lex.py.in', configuration : flex_cdata) # Find bison, configure grammar generator -bison_parser_cdata = configuration_data() bison_cdata = configuration_data() bison_min_version='2.4' @@ -45,15 +44,7 @@ else message('bison version @0@ >= @1@: YES'.format(bversion, bison_min_version)) endif -if bversion.version_compare('>' + '2.5') - bison_parser_cdata.set('BISON_PURE_PARSER', '%define api.pure full') -else - bison_parser_cdata.set('BISON_PURE_PARSER', '%pure-parser') -endif -gen_grammar_file = configure_file(input : 'grammar.y.in', - output : 'grammar.y', - configuration : bison_parser_cdata) bison_cdata.set('BISON', bison.path()) bison_cdata.set('BISON_ARGS', '') @@ -70,7 +61,7 @@ parser = custom_target('parselex', ) grammar = custom_target('parsegrammar', - input : gen_grammar_file, + input : 'grammar.y', output : ['grammar.tab.c', 'grammar.tab.h'], command : [python3, gen_grammar, '@OUTPUT0@', '@OUTPUT1@', '@INPUT@'], depends : [parser], |