|
| 1 | +From 47e3916842ffefd7def84ae85758fdcceeb77839 Mon Sep 17 00:00:00 2001 |
| 2 | +From: Ross Burton <ross.burton@arm.com> |
| 3 | +Date: Thu, 20 Mar 2025 12:16:50 +0000 |
| 4 | +Subject: [PATCH] build(tests): add missing parser->scanner dependencies |
| 5 | + |
| 6 | +With sufficient parallelism and `make --shuffle` to reorder builds the |
| 7 | +test suite occasionally fails to build with errors like this: |
| 8 | + |
| 9 | + tests/bison_yylval_parser.y:36:10: fatal error: bison_yylval_scanner.h: No such file or directory |
| 10 | + 36 | #include "bison_yylval_scanner.h" |
| 11 | + |
| 12 | +Solve this by adding the missing dependencies to the *_parser.o targets |
| 13 | +on the _scanner.h files. |
| 14 | + |
| 15 | +Upstream-Status: Submitted [https://github.com/westes/flex/pull/702] |
| 16 | +Signed-off-by: Ross Burton <ross.burton@arm.com> |
| 17 | +--- |
| 18 | + tests/Makefile.am | 3 +++ |
| 19 | + 1 file changed, 3 insertions(+) |
| 20 | + |
| 21 | +diff --git a/tests/Makefile.am b/tests/Makefile.am |
| 22 | +index 2cb51df..d0c199d 100644 |
| 23 | +--- a/tests/Makefile.am |
| 24 | ++++ b/tests/Makefile.am |
| 25 | +@@ -343,6 +343,7 @@ FLEX = $(top_builddir)/src/flex |
| 26 | + |
| 27 | + bison_nr_main.$(OBJEXT): bison_nr_parser.h bison_nr_scanner.h |
| 28 | + bison_nr_scanner.$(OBJEXT): bison_nr_parser.h |
| 29 | ++bison_nr_parser.$(OBJEXT): bison_nr_scanner.h |
| 30 | + |
| 31 | + bison_nr_scanner.h: bison_nr_scanner.c |
| 32 | + @if test ! -f $@; then rm -f $<; else :; fi |
| 33 | +@@ -350,6 +351,7 @@ bison_nr_scanner.h: bison_nr_scanner.c |
| 34 | + |
| 35 | + bison_yylloc_main.$(OBJEXT): bison_yylloc_parser.h bison_yylloc_scanner.h |
| 36 | + bison_yylloc_scanner.$(OBJEXT): bison_yylloc_parser.h |
| 37 | ++bison_yylloc_parser.$(OBJEXT): bison_yylloc_scanner.h |
| 38 | + |
| 39 | + bison_yylloc_scanner.h: bison_yylloc_scanner.c |
| 40 | + @if test ! -f $@; then rm -f $<; else :; fi |
| 41 | +@@ -357,6 +359,7 @@ bison_yylloc_scanner.h: bison_yylloc_scanner.c |
| 42 | + |
| 43 | + bison_yylval_main.$(OBJEXT): bison_yylval_parser.h bison_yylval_scanner.h |
| 44 | + bison_yylval_scanner.$(OBJEXT): bison_yylval_parser.h |
| 45 | ++bison_yylval_parser.$(OBJEXT): bison_yylval_scanner.h |
| 46 | + |
| 47 | + bison_yylval_scanner.h: bison_yylval_scanner.c |
| 48 | + @if test ! -f $@; then rm -f $<; else :; fi |
| 49 | +-- |
| 50 | +2.43.0 |
| 51 | + |
0 commit comments