summaryrefslogtreecommitdiff
path: root/debian/patches/0004-bison-test-fixes-Do-not-use-obsolete-bison-construct.patch
diff options
context:
space:
mode:
authorManoj Srivastava <srivasta@golden-gryphon.com>2014-04-09 00:42:23 -0700
committerManoj Srivastava <srivasta@golden-gryphon.com>2014-04-11 11:08:42 -0700
commit7db3bf58a48b9952fac1fd907fb23f5d257ed7ec (patch)
tree754a1cb09b3d8bcdb8a59f134a8f2cde9ca4813c /debian/patches/0004-bison-test-fixes-Do-not-use-obsolete-bison-construct.patch
parent995114eb4b550e2db30a10423b26327e3337582d (diff)
[master]: New upstream version.
* internationalization: added support for various languages. Fix make install target to not fail when the flex++ program is already installed. various portability fixes that quiet compiler warnings on 64-bit hosts. numerous bug fixes. * Moved to a new dh based build system. Also moved to a 3.0 source format, using debcherry. * Bug fix: "cross build support", thanks to Eleanor Chen. We have moved to a standard dh based build, so we should not have this issue any more. (Closes: #719955). * Bug fix: "examples not included into binary packages", thanks to Carl Fürstenberg. Examples are in this version. (Closes: #560387). * Bug fix: "new upstream release 2.5.37", thanks to Peter Eisentraut (Closes: #729759). * Bug fix: "flex, new release available for download", thanks to Gianfranco Costamagna (Closes: #736345). * Bug fix: "please mark flex as Multi-Arch: allowed", thanks to Steve Langasek. Redid the patch to work with dh. (Closes: #611230). * Updating to a new build system means that the changes made to the build system in the NMU are not needed, dh does the right thing. * The new upstream release added the prototypes in re-entrant mode, so we are no longer carrying those patches. Signed-off-by: Manoj Srivastava <srivasta@golden-gryphon.com>
Diffstat (limited to 'debian/patches/0004-bison-test-fixes-Do-not-use-obsolete-bison-construct.patch')
-rw-r--r--debian/patches/0004-bison-test-fixes-Do-not-use-obsolete-bison-construct.patch77
1 files changed, 77 insertions, 0 deletions
diff --git a/debian/patches/0004-bison-test-fixes-Do-not-use-obsolete-bison-construct.patch b/debian/patches/0004-bison-test-fixes-Do-not-use-obsolete-bison-construct.patch
new file mode 100644
index 0000000..466c75d
--- /dev/null
+++ b/debian/patches/0004-bison-test-fixes-Do-not-use-obsolete-bison-construct.patch
@@ -0,0 +1,77 @@
+From 20ab0512841996f895a43d4490f695206ad0e4a2 Mon Sep 17 00:00:00 2001
+From: Manoj Srivastava <srivasta@golden-gryphon.com>
+Date: Wed, 9 Apr 2014 00:23:07 -0700
+Subject: [PATCH 4/4] [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 <srivasta@golden-gryphon.com>
+---
+ tests/test-bison-yylloc/parser.y | 4 ++--
+ tests/test-bison-yylval/parser.y | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/tests/test-bison-yylloc/parser.y b/tests/test-bison-yylloc/parser.y
+index e8f4e56..224d252 100644
+--- a/tests/test-bison-yylloc/parser.y
++++ b/tests/test-bison-yylloc/parser.y
+@@ -22,6 +22,7 @@
+ */
+
+ %parse-param { void* scanner }
++%lex-param { void* scanner }
+
+ /*
+ How to compile:
+@@ -34,7 +35,6 @@
+ #include "config.h"
+
+ #define YYERROR_VERBOSE 1
+-#define YYLEX_PARAM scanner
+
+ extern int testget_lineno(void*);
+
+@@ -52,7 +52,7 @@ int process_text(char* s) {
+
+ %}
+
+-%pure_parser
++%pure-parser
+
+ %union {
+ int lineno;
+diff --git a/tests/test-bison-yylval/parser.y b/tests/test-bison-yylval/parser.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="parser.c" --name-prefix="test" parser.y
+ */
+ %parse-param { void* scanner }
++%lex-param { void* scanner }
+ %{
+ #include <stdio.h>
+ #include <stdlib.h>
+@@ -33,7 +34,6 @@
+ #include "config.h"
+
+ #define YYERROR_VERBOSE 1
+-#define YYLEX_PARAM scanner
+
+
+ /* A dummy function. A check against seg-faults in yylval->str. */
+@@ -49,7 +49,7 @@ int process_text(char* s) {
+
+ %}
+
+-%pure_parser
++%pure-parser
+
+ %union {
+ long unused;
+--
+1.9.1
+