mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-09-26 14:00:29 +00:00
Code Issues 1 Projects Releases Wiki Activity

Revert "gst/parse: define pure-parser depending on bison version"

Browse source 
This reverts commit 77141834bb.

This breaks the autotools build and it seems too much effort to
fix that up just to fix a bison warning.
This commit is contained in:
Tim-Philipp Müller 2019-12-03 10:40:37 +00:00
parent ebd0d664d4
commit 7105428470
2 changed files with 2 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gst/parse/grammar.y.in → gst/parse/grammar.y
View file

@ -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
%%

11
gst/parse/meson.build
View file

@ -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],