From 29a4e487527d109f517fc47a7c284b7732b27a10 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 12 Jun 2023 21:04:25 +0200 Subject: [PATCH] Refix builds on machines with modern flex versions Bootgen embeds an old version of flex, but uses the system include syntax (#include <>) to reference it, causing conflicts on systems with the development headers for a modern flex version installed, leading to build issues like: ../bisonflex/cmdoptions.yy.cpp: In member function 'virtual int CO::FlexScanner::yylex()': ../bisonflex/cmdoptions.yy.cpp:1362:18: error: no match for 'operator=' (operand types are 'std::istream' {aka 'std::basic_istream'} and 'std::istream*' {aka 'std::basic_istream*'}) http://autobuild.buildroot.net/results/293/2936d9b054269b7055e66ab5a7f7c1f7f4926d48/build-end.log Fix it by using normal local #include statements by: sed -i 's//"FlexLexer.h"/g' * Notice: This was already fixed on master with: https://github.com/Xilinx/bootgen/pull/20 Notice: The patch was not applied, instead a different patch with the same content was applied to master: https://github.com/Xilinx/bootgen/commit/af4f7083ea92931a07e47995eb2bc2a348c577ed This patch was not applied to the xlnx_rel_v2023.1 branch, instead most of the content was included in: https://github.com/Xilinx/bootgen/commit/bfba91b2c84160dc203ff09f0e930d82ed06a83a But the cmdoptions.yy.cpp and reginit.yy.cpp hunks were accidently dropped: https://github.com/Xilinx/bootgen/commit/bfba91b2c84160dc203ff09f0e930d82ed06a83a#diff-e0287adb420dbecc112acdf7d4a1efba8ea6cbf06401e4e8679b8ffd22a091d8 Signed-off-by: Peter Korsgaard --- cmdoptions.yy.cpp | 2 +- reginit.yy.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmdoptions.yy.cpp b/cmdoptions.yy.cpp index 38fed35..4e940ab 100644 --- a/cmdoptions.yy.cpp +++ b/cmdoptions.yy.cpp @@ -379,7 +379,7 @@ typedef unsigned char YY_CHAR; #define yytext_ptr yytext -#include +#include "FlexLexer.h" int yyFlexLexer::yywrap() { return 1; } int yyFlexLexer::yylex() diff --git a/reginit.yy.cpp b/reginit.yy.cpp index d830734..dede473 100644 --- a/reginit.yy.cpp +++ b/reginit.yy.cpp @@ -379,7 +379,7 @@ typedef unsigned char YY_CHAR; #define yytext_ptr yytext -#include +#include "FlexLexer.h" int yyFlexLexer::yywrap() { return 1; } int yyFlexLexer::yylex()