Skip to content

Commit 29a4e48

Browse files
committed
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<char>'} and 'std::istream*' {aka 'std::basic_istream<char>*'}) http://autobuild.buildroot.net/results/293/2936d9b054269b7055e66ab5a7f7c1f7f4926d48/build-end.log Fix it by using normal local #include statements by: sed -i 's/<FlexLexer.h>/"FlexLexer.h"/g' * Notice: This was already fixed on master with: Xilinx#20 Notice: The patch was not applied, instead a different patch with the same content was applied to master: Xilinx@af4f708 This patch was not applied to the xlnx_rel_v2023.1 branch, instead most of the content was included in: Xilinx@bfba91b But the cmdoptions.yy.cpp and reginit.yy.cpp hunks were accidently dropped: Xilinx@bfba91b#diff-e0287adb420dbecc112acdf7d4a1efba8ea6cbf06401e4e8679b8ffd22a091d8 Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
1 parent 4f1e1ca commit 29a4e48

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

cmdoptions.yy.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ typedef unsigned char YY_CHAR;
379379

380380
#define yytext_ptr yytext
381381

382-
#include <FlexLexer.h>
382+
#include "FlexLexer.h"
383383

384384
int yyFlexLexer::yywrap() { return 1; }
385385
int yyFlexLexer::yylex()

reginit.yy.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ typedef unsigned char YY_CHAR;
379379

380380
#define yytext_ptr yytext
381381

382-
#include <FlexLexer.h>
382+
#include "FlexLexer.h"
383383

384384
int yyFlexLexer::yywrap() { return 1; }
385385
int yyFlexLexer::yylex()

0 commit comments

Comments
 (0)