Date: Mon, 25 May 2020 18:25:19 +0000 (UTC) From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r536493 - in head: cad/verilator/files devel/libexplain/files editors/openoffice-4/files editors/openoffice-devel/files Message-ID: <202005251825.04PIPJPv052374@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sunpoet Date: Mon May 25 18:25:19 2020 New Revision: 536493 URL: https://svnweb.freebsd.org/changeset/ports/536493 Log: Fix build with bison 3.6.2 Added: head/cad/verilator/files/ head/cad/verilator/files/patch-src-verilog.y (contents, props changed) head/devel/libexplain/files/patch-Makefile.in (contents, props changed) head/devel/libexplain/files/patch-codegen_gram.y (contents, props changed) head/devel/libexplain/files/patch-libexplain_acl__grammar.y (contents, props changed) head/devel/libexplain/files/patch-libexplain_parse__bits.y (contents, props changed) head/devel/libexplain/files/patch-libexplain_printf__format.y (contents, props changed) head/editors/openoffice-4/files/patch-connectivity_source_parse_sqlbison.y (contents, props changed) head/editors/openoffice-4/files/patch-idlc_source_parser.y (contents, props changed) head/editors/openoffice-devel/files/patch-connectivity_source_parse_sqlbison.y (contents, props changed) head/editors/openoffice-devel/files/patch-idlc_source_parser.y (contents, props changed) Added: head/cad/verilator/files/patch-src-verilog.y ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/cad/verilator/files/patch-src-verilog.y Mon May 25 18:25:19 2020 (r536493) @@ -0,0 +1,18 @@ +--- src/verilog.y.orig 2020-02-08 14:14:33 UTC ++++ src/verilog.y +@@ -20,6 +20,7 @@ + // Original code here by Paul Wasson and Duane Galbi + //************************************************************************* + ++%define parse.error verbose + %{ + #include "V3Ast.h" + #include "V3Global.h" +@@ -29,7 +30,6 @@ + #include <cstdlib> + #include <cstdarg> + +-#define YYERROR_VERBOSE 1 + #define YYINITDEPTH 10000 // Older bisons ignore YYMAXDEPTH + #define YYMAXDEPTH 10000 + Added: head/devel/libexplain/files/patch-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/libexplain/files/patch-Makefile.in Mon May 25 18:25:19 2020 (r536493) @@ -0,0 +1,59 @@ +--- Makefile.in.orig 2013-12-08 01:47:33 UTC ++++ Makefile.in +@@ -357,10 +357,9 @@ codegen/get_user_name.$(OBJEXT) codegen/get_user_name. + + codegen/gram.yacc.c codegen/gram.yacc.h: codegen/gram.y + $(YACC) -d $(YFLAGS) codegen/gram.y +- sed -e 's/[yY][yY]/gram_/g' -e '/<stdio.h>/d' -e '/<stdlib.h>/d' -e \ ++ sed -e '/<stdio.h>/d' -e '/<stdlib.h>/d' -e \ + '/<stddef.h>/d' y.tab.c > codegen/gram.yacc.c +- sed -e 's/[yY][yY]/gram_/g' -e 's/Y_TAB_H/codegen_gram_YACC_H/g' \ +- y.tab.h > codegen/gram.yacc.h ++ cp y.tab.h codegen/gram.yacc.h + test -f y.output && mv y.output codegen/gram.output || true + rm -f y.tab.c y.tab.h y.output || true + +@@ -3997,12 +3996,10 @@ libexplain/acl_get_file_or_die.$(OBJEXT) libexplain/ac + libexplain/acl_grammar.yacc.c libexplain/acl_grammar.yacc.h: \ + libexplain/acl_grammar.y + $(YACC) -d $(YFLAGS) libexplain/acl_grammar.y +- sed -e 's/[yY][yY]/acl_grammar_/g' -e '/<stdio.h>/d' -e \ ++ sed -e '/<stdio.h>/d' -e \ + '/<stdlib.h>/d' -e '/<stddef.h>/d' y.tab.c > \ + libexplain/acl_grammar.yacc.c +- sed -e 's/[yY][yY]/acl_grammar_/g' -e \ +- 's/Y_TAB_H/libexplain_acl_grammar_YACC_H/g' y.tab.h > \ +- libexplain/acl_grammar.yacc.h ++ cp y.tab.h libexplain/acl_grammar.yacc.h + test -f y.output && mv y.output libexplain/acl_grammar.output || true + rm -f y.tab.c y.tab.h y.output || true + +@@ -30978,11 +30975,9 @@ libexplain/output/warning.$(OBJEXT) libexplain/output/ + libexplain/parse_bits.yacc.c libexplain/parse_bits.yacc.h: \ + libexplain/parse_bits.y + $(YACC) -d $(YFLAGS) libexplain/parse_bits.y +- sed -e 's/[yY][yY]/parse_bits_/g' -e '/<stdio.h>/d' -e '/<stdlib.h>/d' \ ++ sed -e '/<stdio.h>/d' -e '/<stdlib.h>/d' \ + -e '/<stddef.h>/d' y.tab.c > libexplain/parse_bits.yacc.c +- sed -e 's/[yY][yY]/parse_bits_/g' -e \ +- 's/Y_TAB_H/libexplain_parse_bits_YACC_H/g' y.tab.h > \ +- libexplain/parse_bits.yacc.h ++ cp y.tab.h libexplain/parse_bits.yacc.h + test -f y.output && mv y.output libexplain/parse_bits.output || true + rm -f y.tab.c y.tab.h y.output || true + +@@ -31338,12 +31333,10 @@ $(includedir)/libexplain/printf.h: .mkdir.__includedir + libexplain/printf_format.yacc.c libexplain/printf_format.yacc.h: \ + libexplain/printf_format.y + $(YACC) -d $(YFLAGS) libexplain/printf_format.y +- sed -e 's/[yY][yY]/printf_format_/g' -e '/<stdio.h>/d' -e \ ++ sed -e '/<stdio.h>/d' -e \ + '/<stdlib.h>/d' -e '/<stddef.h>/d' y.tab.c > \ + libexplain/printf_format.yacc.c +- sed -e 's/[yY][yY]/printf_format_/g' -e \ +- 's/Y_TAB_H/libexplain_printf_format_YACC_H/g' y.tab.h > \ +- libexplain/printf_format.yacc.h ++ cp y.tab.h libexplain/printf_format.yacc.h + test -f y.output && mv y.output libexplain/printf_format.output || true + rm -f y.tab.c y.tab.h y.output || true + Added: head/devel/libexplain/files/patch-codegen_gram.y ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/libexplain/files/patch-codegen_gram.y Mon May 25 18:25:19 2020 (r536493) @@ -0,0 +1,19 @@ +--- codegen/gram.y.orig 2013-12-08 01:47:33 UTC ++++ codegen/gram.y +@@ -17,6 +17,8 @@ + * with this program. If not, see <http://www.gnu.org/licenses/>. + */ + ++%define api.prefix {gram_} ++%define parse.error verbose + %{ + + #include <libexplain/ac/stdio.h> +@@ -29,7 +31,6 @@ + #include <codegen/node.h> + + #define YYDEBUG 0 +-#define YYERROR_VERBOSE 1 + + %} + Added: head/devel/libexplain/files/patch-libexplain_acl__grammar.y ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/libexplain/files/patch-libexplain_acl__grammar.y Mon May 25 18:25:19 2020 (r536493) @@ -0,0 +1,19 @@ +--- libexplain/acl_grammar.y.orig 2013-12-08 01:47:33 UTC ++++ libexplain/acl_grammar.y +@@ -17,6 +17,8 @@ + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + ++%define api.prefix {acl_grammar_} ++%define parse.error verbose + %{ + + #include <libexplain/ac/ctype.h> +@@ -31,7 +33,6 @@ + #include <libexplain/acl_grammar.h> + #include <libexplain/gcc_attributes.h> + +-#define YYERROR_VERBOSE 1 + #define YYDEBUG 0 + + /* is this forward enough? */ Added: head/devel/libexplain/files/patch-libexplain_parse__bits.y ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/libexplain/files/patch-libexplain_parse__bits.y Mon May 25 18:25:19 2020 (r536493) @@ -0,0 +1,19 @@ +--- libexplain/parse_bits.y.orig 2013-12-08 01:47:33 UTC ++++ libexplain/parse_bits.y +@@ -17,6 +17,8 @@ + along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + ++%define api.prefix {parse_bits_} ++%define parse.error verbose + %{ + + #include <libexplain/ac/ctype.h> +@@ -38,7 +40,6 @@ + #include <libexplain/wrap_and_print.h> + + #define YYDEBUG 0 +-#define YYERROR_VERBOSE 1 + + #if YYDEBUG + extern int yydebug; Added: head/devel/libexplain/files/patch-libexplain_printf__format.y ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/libexplain/files/patch-libexplain_printf__format.y Mon May 25 18:25:19 2020 (r536493) @@ -0,0 +1,10 @@ +--- libexplain/printf_format.y.orig 2013-12-08 01:47:33 UTC ++++ libexplain/printf_format.y +@@ -17,6 +17,7 @@ + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + ++%define api.prefix {printf_format_} + %{ + + #include <libexplain/ac/assert.h> Added: head/editors/openoffice-4/files/patch-connectivity_source_parse_sqlbison.y ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/openoffice-4/files/patch-connectivity_source_parse_sqlbison.y Mon May 25 18:25:19 2020 (r536493) @@ -0,0 +1,16 @@ +--- connectivity/source/parse/sqlbison.y.orig 2019-08-14 17:32:43 UTC ++++ connectivity/source/parse/sqlbison.y +@@ -1,3 +1,4 @@ ++%define parse.error verbose + %{ + /************************************************************** + * +@@ -123,8 +124,6 @@ static connectivity::OSQLInternalNode* newNode(const : + + + connectivity::OSQLParser* xxx_pGLOBAL_SQLPARSER; +- +-#define YYERROR_VERBOSE + + #define SQLyyerror(s) \ + { \ Added: head/editors/openoffice-4/files/patch-idlc_source_parser.y ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/openoffice-4/files/patch-idlc_source_parser.y Mon May 25 18:25:19 2020 (r536493) @@ -0,0 +1,18 @@ +--- idlc/source/parser.y.orig 2019-08-14 17:32:51 UTC ++++ idlc/source/parser.y +@@ -25,6 +25,7 @@ + * parser.yy - BISON grammar for IDLC 1.0 + */ + ++%define parse.error verbose + %{ + #include <string.h> + +@@ -103,7 +104,6 @@ + using namespace ::rtl; + + #define YYDEBUG 1 +-#define YYERROR_VERBOSE 1 + + extern int yylex(void); + void yyerror(char const *); Added: head/editors/openoffice-devel/files/patch-connectivity_source_parse_sqlbison.y ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/openoffice-devel/files/patch-connectivity_source_parse_sqlbison.y Mon May 25 18:25:19 2020 (r536493) @@ -0,0 +1,16 @@ +--- connectivity/source/parse/sqlbison.y.orig 2019-09-17 22:55:11 UTC ++++ connectivity/source/parse/sqlbison.y +@@ -1,3 +1,4 @@ ++%define parse.error verbose + %{ + /************************************************************** + * +@@ -123,8 +124,6 @@ static connectivity::OSQLInternalNode* newNode(const : + + + connectivity::OSQLParser* xxx_pGLOBAL_SQLPARSER; +- +-#define YYERROR_VERBOSE + + #define SQLyyerror(s) \ + { \ Added: head/editors/openoffice-devel/files/patch-idlc_source_parser.y ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/openoffice-devel/files/patch-idlc_source_parser.y Mon May 25 18:25:19 2020 (r536493) @@ -0,0 +1,18 @@ +--- idlc/source/parser.y.orig 2019-09-17 22:55:16 UTC ++++ idlc/source/parser.y +@@ -25,6 +25,7 @@ + * parser.yy - BISON grammar for IDLC 1.0 + */ + ++%define parse.error verbose + %{ + #include <string.h> + +@@ -103,7 +104,6 @@ + using namespace ::rtl; + + #define YYDEBUG 1 +-#define YYERROR_VERBOSE 1 + + extern int yylex(void); + void yyerror(char const *);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202005251825.04PIPJPv052374>