From 57292050eed4d1bd4d656abd1913e0cfa6d23315 Mon Sep 17 00:00:00 2001 From: John Halley Gotway Date: Fri, 13 Jan 2023 15:48:54 -0700 Subject: [PATCH 1/2] Per #2408, update vx_config Makefiles to reset yystate = 0 to = 8 immediately after its created. --- src/basic/vx_config/Makefile.am | 5 ++++- src/basic/vx_config/Makefile.in | 6 +++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/basic/vx_config/Makefile.am b/src/basic/vx_config/Makefile.am index b4d2d52ce6..0e90f4c8b6 100644 --- a/src/basic/vx_config/Makefile.am +++ b/src/basic/vx_config/Makefile.am @@ -9,8 +9,11 @@ MAINTAINERCLEANFILES = Makefile.in include ${top_srcdir}/Make-include # Yacc/lex flags +# Initialize yystate to 8 to allow for empty configuartion files -AM_YFLAGS = --defines=config.tab.h -p config +AM_YFLAGS = --defines=config.tab.h -p config ; \ + cat config.tab.cc | sed 's/yystate = 0;/yystate = 8;/g' > config.tab.cc.patch ; \ + mv config.tab.cc.patch config.tab.cc # The library diff --git a/src/basic/vx_config/Makefile.in b/src/basic/vx_config/Makefile.in index f4f2a345a5..f23047ba00 100644 --- a/src/basic/vx_config/Makefile.in +++ b/src/basic/vx_config/Makefile.in @@ -401,7 +401,11 @@ top_srcdir = @top_srcdir@ MAINTAINERCLEANFILES = Makefile.in # Yacc/lex flags -AM_YFLAGS = --defines=config.tab.h -p config +# Initialize yystate to 8 to allow for empty configuartion files +AM_YFLAGS = --defines=config.tab.h -p config ; \ + cat config.tab.cc | sed 's/yystate = 0;/yystate = 8;/g' > config.tab.cc.patch ; \ + mv config.tab.cc.patch config.tab.cc + # The library noinst_LIBRARIES = libvx_config.a From 6de8df391a69bce927626646267e052f08dee957 Mon Sep 17 00:00:00 2001 From: John Halley Gotway Date: Fri, 13 Jan 2023 16:17:27 -0700 Subject: [PATCH 2/2] Per #2408, switch to more compact sed -i option. --- src/basic/vx_config/Makefile.am | 3 +-- src/basic/vx_config/Makefile.in | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/basic/vx_config/Makefile.am b/src/basic/vx_config/Makefile.am index 0e90f4c8b6..3bbde1ca86 100644 --- a/src/basic/vx_config/Makefile.am +++ b/src/basic/vx_config/Makefile.am @@ -12,8 +12,7 @@ include ${top_srcdir}/Make-include # Initialize yystate to 8 to allow for empty configuartion files AM_YFLAGS = --defines=config.tab.h -p config ; \ - cat config.tab.cc | sed 's/yystate = 0;/yystate = 8;/g' > config.tab.cc.patch ; \ - mv config.tab.cc.patch config.tab.cc + sed -i 's/yystate = 0;/yystate = 8;/g' config.tab.cc # The library diff --git a/src/basic/vx_config/Makefile.in b/src/basic/vx_config/Makefile.in index f23047ba00..f59251ae49 100644 --- a/src/basic/vx_config/Makefile.in +++ b/src/basic/vx_config/Makefile.in @@ -403,8 +403,7 @@ MAINTAINERCLEANFILES = Makefile.in # Yacc/lex flags # Initialize yystate to 8 to allow for empty configuartion files AM_YFLAGS = --defines=config.tab.h -p config ; \ - cat config.tab.cc | sed 's/yystate = 0;/yystate = 8;/g' > config.tab.cc.patch ; \ - mv config.tab.cc.patch config.tab.cc + sed -i 's/yystate = 0;/yystate = 8;/g' config.tab.cc # The library