summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/flex/files
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/flex/files')
-rw-r--r--meta/recipes-devtools/flex/files/0001-bison-test-fixes-Do-not-use-obsolete-bison-construct.patch80
-rw-r--r--meta/recipes-devtools/flex/files/do_not_create_pdf_doc.patch17
-rwxr-xr-xmeta/recipes-devtools/flex/files/run-ptest29
3 files changed, 0 insertions, 126 deletions
diff --git a/meta/recipes-devtools/flex/files/0001-bison-test-fixes-Do-not-use-obsolete-bison-construct.patch b/meta/recipes-devtools/flex/files/0001-bison-test-fixes-Do-not-use-obsolete-bison-construct.patch
deleted file mode 100644
index 3504f546d3..0000000000
--- a/meta/recipes-devtools/flex/files/0001-bison-test-fixes-Do-not-use-obsolete-bison-construct.patch
+++ /dev/null
@@ -1,80 +0,0 @@
1From 7fbc074901129ffaff9e18fadacae62d8053ad95 Mon Sep 17 00:00:00 2001
2From: Manoj Srivastava <srivasta@golden-gryphon.com>
3Date: Wed, 9 Apr 2014 00:23:07 -0700
4Subject: [PATCH] Do not use obsolete bison constructs in tests.
5
6In Bison 3.0, support for YYLEX_PARAM and YYPARSE_PARAM has been
7removed (deprecated in Bison 1.875): use %lex-param, %parse-param, or
8%param. This commit fixes the tests so they still work.
9
10Signed-off-by: Manoj Srivastava <srivasta@golden-gryphon.com>
11
12Upstream-Status: Backport [from http://sourceforge.net/p/flex/bugs/169/]
13
14Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
15---
16 tests/test-bison-yylloc/parser.y | 4 ++--
17 tests/test-bison-yylval/parser.y | 4 ++--
18 2 files changed, 4 insertions(+), 4 deletions(-)
19
20diff --git a/tests/test-bison-yylloc/parser.y b/tests/test-bison-yylloc/parser.y
21index e8f4e56..224d252 100644
22--- a/tests/test-bison-yylloc/parser.y
23+++ b/tests/test-bison-yylloc/parser.y
24@@ -22,6 +22,7 @@
25 */
26
27 %parse-param { void* scanner }
28+%lex-param { void* scanner }
29
30 /*
31 How to compile:
32@@ -34,7 +35,6 @@
33 #include "config.h"
34
35 #define YYERROR_VERBOSE 1
36-#define YYLEX_PARAM scanner
37
38 extern int testget_lineno(void*);
39
40@@ -52,7 +52,7 @@ int process_text(char* s) {
41
42 %}
43
44-%pure_parser
45+%pure-parser
46
47 %union {
48 int lineno;
49diff --git a/tests/test-bison-yylval/parser.y b/tests/test-bison-yylval/parser.y
50index 0ffdb89..626c5e7 100644
51--- a/tests/test-bison-yylval/parser.y
52+++ b/tests/test-bison-yylval/parser.y
53@@ -26,6 +26,7 @@
54 bison --defines --output-file="parser.c" --name-prefix="test" parser.y
55 */
56 %parse-param { void* scanner }
57+%lex-param { void* scanner }
58 %{
59 #include <stdio.h>
60 #include <stdlib.h>
61@@ -33,7 +34,6 @@
62 #include "config.h"
63
64 #define YYERROR_VERBOSE 1
65-#define YYLEX_PARAM scanner
66
67
68 /* A dummy function. A check against seg-faults in yylval->str. */
69@@ -49,7 +49,7 @@ int process_text(char* s) {
70
71 %}
72
73-%pure_parser
74+%pure-parser
75
76 %union {
77 long unused;
78--
791.9.1
80
diff --git a/meta/recipes-devtools/flex/files/do_not_create_pdf_doc.patch b/meta/recipes-devtools/flex/files/do_not_create_pdf_doc.patch
deleted file mode 100644
index 032833ae7a..0000000000
--- a/meta/recipes-devtools/flex/files/do_not_create_pdf_doc.patch
+++ /dev/null
@@ -1,17 +0,0 @@
1Upstream-Status: Inappropriate (embedded specific)
2
3Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
4
5Index: flex-2.5.37/doc/Makefile.am
6===================================================================
7--- flex-2.5.37.orig/doc/Makefile.am 2012-07-21 04:18:27.000000000 +0300
8+++ flex-2.5.37/doc/Makefile.am 2013-07-30 17:57:09.834834531 +0300
9@@ -2,7 +2,7 @@
10
11 info_TEXINFOS = flex.texi
12 dist_man_MANS = flex.1
13-dist_doc_DATA= flex.pdf
14+EXTRA_DIST= flex.pdf
15
16 CLEANFILES = \
17 flex.hks \
diff --git a/meta/recipes-devtools/flex/files/run-ptest b/meta/recipes-devtools/flex/files/run-ptest
deleted file mode 100755
index bffba16f70..0000000000
--- a/meta/recipes-devtools/flex/files/run-ptest
+++ /dev/null
@@ -1,29 +0,0 @@
1#!/bin/sh
2
3test1="test-alloc-extra test-array-nr test-array-r test-basic-nr test-basic-r test-extended test-quotes \
4test-bison-nr test-bison-yylloc test-bison-yylval test-c++-basic test-c-cpp-nr test-prefix-nr test-ccl \
5test-c-cpp-r test-c++-multiple-scanners test-mem-r test-mem-nr test-debug-nr test-linedir-r test-noansi-r \
6test-yyextra test-header-r test-noansi-nr test-debug-r TEMPLATE test-top test-header-nr test-prefix-r"
7test2="test-multiple-scanners-nr test-posixly-correct test-posix test-string-r test-string-nr"
8test3="test-pthread test-include-by-push test-include-by-buffer test-include-by-reentrant"
9test4="test-lineno-nr test-lineno-r test-lineno-trailing"
10test5="test-c++-yywrap test-rescan-r test-rescan-nr"
11test6="test-reject-nr test-reject-r"
12test7="test-reject-ser test-reject-ver"
13test8="test-multiple-scanners-r"
14
15output() {
16 if [ $? -eq 0 ]; \
17 then echo "PASS: $i"; \
18 else echo "FAIL: $i"; \
19 fi;
20}
21
22for i in $test1; do $i/$i < $i/test.input >/dev/null; output; done
23for i in $test2; do $i/$i >/dev/null; output; done
24for i in $test3; do cd $i; ./$i test-1.input >/dev/null; output; cd ..; done
25for i in $test4; do test `$i/$i < $i/test.input` -eq `$i/$i 1 < $i/test.input` >/dev/null; output; done
26for i in $test5; do $i/$i $i/test.input >/dev/null; output; done
27for i in $test6; do test-reject/$i < test-reject/test.input >/dev/null; output; done
28for i in $test7; do test-reject/$i test-reject/$i.tables < test-reject/test.input >/dev/null; output; done
29cd $test8; ./$test8 >/dev/null; i=$test8 output