From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefan Schantl To: development@lists.ipfire.org Subject: [PATCH] flex: Fix broken testsuite with bison 3.0 Date: Fri, 23 Oct 2015 19:18:32 +0200 Message-ID: <1445620712-1347-1-git-send-email-stefan.schantl@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3500523468474934574==" List-Id: --===============3500523468474934574== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable In Bison 3.0, support for YYLEX_PARAM and YYPARSE_PARAM has been removed (deprecated in Bison 1.875): use %lex-param, %parse-param, or %param. This commit adds a patch to fix the tests so they still work. Fixes #10951. Signed-off-by: Stefan Schantl --- flex/flex.nm | 2 +- ...fixes-Do-not-use-obsolete-bison-construct.patch | 79 ++++++++++++++++++++= ++ pdns/pdns.nm | 9 +-- 3 files changed, 85 insertions(+), 5 deletions(-) create mode 100644 flex/patches/0001-bison-test-fixes-Do-not-use-obsolete-bi= son-construct.patch diff --git a/flex/flex.nm b/flex/flex.nm index 7bff151..4c5b555 100644 --- a/flex/flex.nm +++ b/flex/flex.nm @@ -5,7 +5,7 @@ =20 name =3D flex version =3D 2.5.39 -release =3D 2 +release =3D 2.1 =20 groups =3D Development/Tools url =3D http://flex.sourceforge.net/ diff --git a/flex/patches/0001-bison-test-fixes-Do-not-use-obsolete-bison-con= struct.patch b/flex/patches/0001-bison-test-fixes-Do-not-use-obsolete-bison-c= onstruct.patch new file mode 100644 index 0000000..eb46be3 --- /dev/null +++ b/flex/patches/0001-bison-test-fixes-Do-not-use-obsolete-bison-construct.= patch @@ -0,0 +1,79 @@ +From 35aba3d6e3c99fcd527c677bef8efeb59963fe8a Mon Sep 17 00:00:00 2001 +Message-Id: <35aba3d6e3c99fcd527c677bef8efeb59963fe8a.1397340102.git.srivast= a(a)golden-gryphon.com> +From: Manoj Srivastava +Date: Wed, 9 Apr 2014 00:23:07 -0700 +Subject: [PATCH 1/1] [bison-test-fixes] Do not use obsolete bison constructs= in tests. + +In Bison 3.0, support for YYLEX_PARAM and YYPARSE_PARAM has been +removed (deprecated in Bison 1.875): use %lex-param, %parse-param, or +%param. This commit fixes the tests so they still work. + +Signed-off-by: Manoj Srivastava +--- + tests/test-bison-yylloc/parser.y | 4 ++-- + tests/test-bison-yylval/parser.y | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + 50.0% tests/test-bison-yylloc/ + 50.0% tests/test-bison-yylval/ + +diff --git a/tests/test-bison-yylloc/parser.y b/tests/test-bison-yylloc/pars= er.y +index e8f4e56..224d252 100644 +--- a/tests/test-bison-yylloc/parser.y ++++ b/tests/test-bison-yylloc/parser.y +@@ -22,6 +22,7 @@ + */ +=20 + %parse-param { void* scanner } ++%lex-param { void* scanner } +=20 + /*=20 + How to compile: +@@ -34,7 +35,6 @@ + #include "config.h" +=20 + #define YYERROR_VERBOSE 1 +-#define YYLEX_PARAM scanner +=20 + extern int testget_lineno(void*); +=20 +@@ -52,7 +52,7 @@ int process_text(char* s) { +=20 + %} +=20 +-%pure_parser ++%pure-parser +=20 + %union { + int lineno; +diff --git a/tests/test-bison-yylval/parser.y b/tests/test-bison-yylval/pars= er.y +index 0ffdb89..626c5e7 100644 +--- a/tests/test-bison-yylval/parser.y ++++ b/tests/test-bison-yylval/parser.y +@@ -26,6 +26,7 @@ + bison --defines --output-file=3D"parser.c" --name-prefix=3D"test" parser= .y + */ + %parse-param { void* scanner } ++%lex-param { void* scanner } + %{ + #include + #include +@@ -33,7 +34,6 @@ + #include "config.h" +=20 + #define YYERROR_VERBOSE 1 +-#define YYLEX_PARAM scanner +=20 +=20 + /* A dummy function. A check against seg-faults in yylval->str. */ +@@ -49,7 +49,7 @@ int process_text(char* s) { +=20 + %} +=20 +-%pure_parser ++%pure-parser +=20 + %union { + long unused; +--=20 +1.9.2 + diff --git a/pdns/pdns.nm b/pdns/pdns.nm index 3c25e9d..4704cec 100644 --- a/pdns/pdns.nm +++ b/pdns/pdns.nm @@ -4,8 +4,8 @@ ############################################################################= ### =20 name =3D pdns -version =3D 3.3.1 -release =3D 2 +version =3D 3.4.6 +release =3D 1 =20 groups =3D Networking/DNS url =3D http://powerdns.com/ @@ -20,6 +20,7 @@ description end =20 source_dl =3D http://downloads.powerdns.com/releases/ +sources =3D %{thisapp}.tar.bz2 =20 build requires @@ -27,14 +28,14 @@ build chrpath gcc-c++ lua-devel - polarssl-devel + mbedtls-devel shadow-utils sqlite-devel zlib-devel end =20 # No paralilelism build. - PARALLELISMFLAGS =3D + #PARALLELISMFLAGS =3D =20 configure_options +=3D \ --sysconfdir=3D%{sysconfdir}/pdns \ --=20 2.4.3 --===============3500523468474934574==--