From 86c8b8b82e39ca4233ef0ae258dc0cb18734151c Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Tue, 15 Dec 2015 13:59:34 +0200 Subject: flex: update to 2.6.0 Drop backported 0001-bison-test-fixes-Do-not-use-obsolete-bison-construct.patch Test cases have been completely rearranged upstream, so ptest support is fully rewritten. Merge split bb/inc as there's no other user of the .inc [RB] As automake insists adding BUILD_SOURCES as a dependency to the "all" target, remove tests/ from the build unless ptests are enabled. This means native builds don't need a bison dependency. If ptests are enabled, we build-depend on flex-native and bison-native for the test suite, and tell it to use the flex-native binary instead of attempting to run the cross flex it just built. [RB] Move in-tree files from files/ to flex/ for consistency. [RB] (From OE-Core rev: 4fe048b7b32eb3d20a43171b83e8ad2037192d34) Signed-off-by: Alexander Kanavin Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- ...fixes-Do-not-use-obsolete-bison-construct.patch | 80 ---------------------- .../flex/files/do_not_create_pdf_doc.patch | 17 ----- meta/recipes-devtools/flex/files/run-ptest | 29 -------- 3 files changed, 126 deletions(-) delete mode 100644 meta/recipes-devtools/flex/files/0001-bison-test-fixes-Do-not-use-obsolete-bison-construct.patch delete mode 100644 meta/recipes-devtools/flex/files/do_not_create_pdf_doc.patch delete mode 100755 meta/recipes-devtools/flex/files/run-ptest (limited to 'meta/recipes-devtools/flex/files') 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 @@ -From 7fbc074901129ffaff9e18fadacae62d8053ad95 Mon Sep 17 00:00:00 2001 -From: Manoj Srivastava -Date: Wed, 9 Apr 2014 00:23:07 -0700 -Subject: [PATCH] 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 - -Upstream-Status: Backport [from http://sourceforge.net/p/flex/bugs/169/] - -Signed-off-by: Hongxu Jia ---- - 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 - #include -@@ -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 - 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 @@ -Upstream-Status: Inappropriate (embedded specific) - -Signed-off-by: Laurentiu Palcu - -Index: flex-2.5.37/doc/Makefile.am -=================================================================== ---- flex-2.5.37.orig/doc/Makefile.am 2012-07-21 04:18:27.000000000 +0300 -+++ flex-2.5.37/doc/Makefile.am 2013-07-30 17:57:09.834834531 +0300 -@@ -2,7 +2,7 @@ - - info_TEXINFOS = flex.texi - dist_man_MANS = flex.1 --dist_doc_DATA= flex.pdf -+EXTRA_DIST= flex.pdf - - CLEANFILES = \ - 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 @@ -#!/bin/sh - -test1="test-alloc-extra test-array-nr test-array-r test-basic-nr test-basic-r test-extended test-quotes \ -test-bison-nr test-bison-yylloc test-bison-yylval test-c++-basic test-c-cpp-nr test-prefix-nr test-ccl \ -test-c-cpp-r test-c++-multiple-scanners test-mem-r test-mem-nr test-debug-nr test-linedir-r test-noansi-r \ -test-yyextra test-header-r test-noansi-nr test-debug-r TEMPLATE test-top test-header-nr test-prefix-r" -test2="test-multiple-scanners-nr test-posixly-correct test-posix test-string-r test-string-nr" -test3="test-pthread test-include-by-push test-include-by-buffer test-include-by-reentrant" -test4="test-lineno-nr test-lineno-r test-lineno-trailing" -test5="test-c++-yywrap test-rescan-r test-rescan-nr" -test6="test-reject-nr test-reject-r" -test7="test-reject-ser test-reject-ver" -test8="test-multiple-scanners-r" - -output() { - if [ $? -eq 0 ]; \ - then echo "PASS: $i"; \ - else echo "FAIL: $i"; \ - fi; -} - -for i in $test1; do $i/$i < $i/test.input >/dev/null; output; done -for i in $test2; do $i/$i >/dev/null; output; done -for i in $test3; do cd $i; ./$i test-1.input >/dev/null; output; cd ..; done -for i in $test4; do test `$i/$i < $i/test.input` -eq `$i/$i 1 < $i/test.input` >/dev/null; output; done -for i in $test5; do $i/$i $i/test.input >/dev/null; output; done -for i in $test6; do test-reject/$i < test-reject/test.input >/dev/null; output; done -for i in $test7; do test-reject/$i test-reject/$i.tables < test-reject/test.input >/dev/null; output; done -cd $test8; ./$test8 >/dev/null; i=$test8 output -- cgit v1.2.3-54-g00ecf