On Fri, 30 Apr 2021 08:42:03 -0600, "Todd C. Miller" wrote: > This is due to a change in bison where it now includes the generated > header file. Using --defines=foo.h instead of just -d fixes that > problem, though you'd also need to comment out the bit that used > to move the header file around. With that fixed, devel/cbmc compiles > for me. The latest cbmc already includes those fixes.
Here's a diff for devel/cbmc to fix compilation with the updated bison once textstyle is disabled. - todd Index: devel/cbmc/Makefile =================================================================== RCS file: /cvs/ports/devel/cbmc/Makefile,v retrieving revision 1.9 diff -u -p -u -r1.9 Makefile --- devel/cbmc/Makefile 12 Jul 2019 20:44:05 -0000 1.9 +++ devel/cbmc/Makefile 30 Apr 2021 19:07:43 -0000 @@ -7,7 +7,7 @@ DISTNAME = cbmc-5.5 GH_ACCOUNT = diffblue GH_PROJECT = cbmc GH_TAGNAME = cbmc-5.5 -REVISION = 2 +REVISION = 3 CATEGORIES = devel Index: devel/cbmc/patches/patch-src_ansi-c_Makefile =================================================================== RCS file: devel/cbmc/patches/patch-src_ansi-c_Makefile diff -N devel/cbmc/patches/patch-src_ansi-c_Makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ devel/cbmc/patches/patch-src_ansi-c_Makefile 30 Apr 2021 14:48:07 -0000 @@ -0,0 +1,19 @@ +$OpenBSD$ +Newer bison includes the defines file in the parser so the name must match. + +Index: src/ansi-c/Makefile +--- src/ansi-c/Makefile.orig ++++ src/ansi-c/Makefile +@@ -37,11 +37,7 @@ all: ansi-c$(LIBEXT) + ############################################################################### + + ansi_c_y.tab.cpp: parser.y +- $(YACC) $(YFLAGS) $$flags -pyyansi_c -d parser.y -o $@ +- +-ansi_c_y.tab.h: ansi_c_y.tab.cpp +- if [ -e ansi_c_y.tab.hpp ] ; then mv ansi_c_y.tab.hpp ansi_c_y.tab.h ; else \ +- mv ansi_c_y.tab.cpp.h ansi_c_y.tab.h ; fi ++ $(YACC) $(YFLAGS) $$flags -pyyansi_c --defines=ansi_c_y.tab.h parser.y -o $@ + + ansi_c_lex.yy.cpp: scanner.l + $(LEX) -Pyyansi_c -o$@ scanner.l Index: devel/cbmc/patches/patch-src_jsil_Makefile =================================================================== RCS file: devel/cbmc/patches/patch-src_jsil_Makefile diff -N devel/cbmc/patches/patch-src_jsil_Makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ devel/cbmc/patches/patch-src_jsil_Makefile 30 Apr 2021 14:48:10 -0000 @@ -0,0 +1,19 @@ +$OpenBSD$ +Newer bison includes the defines file in the parser so the name must match. + +Index: src/jsil/Makefile +--- src/jsil/Makefile.orig ++++ src/jsil/Makefile +@@ -20,11 +20,7 @@ jsil$(LIBEXT): $(OBJ) + $(LINKLIB) + + jsil_y.tab.cpp: parser.y +- $(YACC) $(YFLAGS) $$flags -pyyjsil -d parser.y -o $@ +- +-jsil_y.tab.h: jsil_y.tab.cpp +- if [ -e jsil_y.tab.hpp ] ; then mv jsil_y.tab.hpp jsil_y.tab.h ; else \ +- mv jsil_y.tab.cpp.h jsil_y.tab.h ; fi ++ $(YACC) $(YFLAGS) $$flags -pyyjsil --defines=jsil_y.tab.h parser.y -o $@ + + jsil_lex.yy.cpp: scanner.l + $(LEX) -Pyyjsil -o$@ scanner.l Index: devel/cbmc/patches/patch-src_json_Makefile =================================================================== RCS file: devel/cbmc/patches/patch-src_json_Makefile diff -N devel/cbmc/patches/patch-src_json_Makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ devel/cbmc/patches/patch-src_json_Makefile 30 Apr 2021 14:48:12 -0000 @@ -0,0 +1,19 @@ +$OpenBSD$ +Newer bison includes the defines file in the parser so the name must match. + +Index: src/json/Makefile +--- src/json/Makefile.orig ++++ src/json/Makefile +@@ -16,11 +16,7 @@ json$(LIBEXT): $(OBJ) + $(LINKLIB) + + json_y.tab.cpp: parser.y +- $(YACC) $(YFLAGS) $$flags -pyyjson -d parser.y -o $@ +- +-json_y.tab.h: json_y.tab.cpp +- if [ -e json_y.tab.hpp ] ; then mv json_y.tab.hpp $@ ; else \ +- mv json_y.tab.cpp.h $@ ; fi ++ $(YACC) $(YFLAGS) $$flags -pyyjson --defines=json_y.tab.h parser.y -o $@ + + json_lex.yy.cpp: scanner.l + $(LEX) -Pyyjson -o$@ scanner.l Index: devel/cbmc/patches/patch-src_memory-models_Makefile =================================================================== RCS file: devel/cbmc/patches/patch-src_memory-models_Makefile diff -N devel/cbmc/patches/patch-src_memory-models_Makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ devel/cbmc/patches/patch-src_memory-models_Makefile 30 Apr 2021 14:48:14 -0000 @@ -0,0 +1,19 @@ +$OpenBSD$ +Newer bison includes the defines file in the parser so the name must match. + +Index: src/memory-models/Makefile +--- src/memory-models/Makefile.orig ++++ src/memory-models/Makefile +@@ -17,11 +17,7 @@ all: mmcc$(EXEEXT) + ############################################################################### + + mm_y.tab.cpp: parser.y +- $(YACC) $(YFLAGS) $$flags -pyymm -d parser.y -o $@ +- +-mm_y.tab.h: mm_y.tab.cpp +- if [ -e mm_y.tab.hpp ] ; then mv mm_y.tab.hpp mm_y.tab.h ; else \ +- mv mm_y.tab.cpp.h mm_y.tab.h ; fi ++ $(YACC) $(YFLAGS) $$flags -pyymm --defines=mm_y.tab.h parser.y -o $@ + + mm_lex.yy.cpp: scanner.l + $(LEX) -Pyymm -o$@ scanner.l Index: devel/cbmc/patches/patch-src_xmllang_Makefile =================================================================== RCS file: devel/cbmc/patches/patch-src_xmllang_Makefile diff -N devel/cbmc/patches/patch-src_xmllang_Makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ devel/cbmc/patches/patch-src_xmllang_Makefile 30 Apr 2021 14:48:05 -0000 @@ -0,0 +1,19 @@ +$OpenBSD$ +Newer bison includes the defines file in the parser so the name must match. + +Index: src/xmllang/Makefile +--- src/xmllang/Makefile.orig ++++ src/xmllang/Makefile +@@ -16,11 +16,7 @@ xmllang$(LIBEXT): $(OBJ) + $(LINKLIB) + + xml_y.tab.cpp: parser.y +- $(YACC) $(YFLAGS) $$flags -pyyxml -d parser.y -o $@ +- +-xml_y.tab.h: xml_y.tab.cpp +- if [ -e xml_y.tab.hpp ] ; then mv xml_y.tab.hpp $@ ; else \ +- mv xml_y.tab.cpp.h $@ ; fi ++ $(YACC) $(YFLAGS) $$flags -pyyxml --defines=xml_y.tab.h parser.y -o $@ + + xml_lex.yy.cpp: scanner.l + $(LEX) -Pyyxml -o$@ scanner.l
