| Andrew Geissler | c5535c9 | 2023-01-27 16:10:19 -0600 | [diff] [blame] | 1 | From 1fa61d77fa7173744dd6dc9d3c4bb0aa783f5222 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Sat, 21 Jan 2023 10:35:46 -0800 |
| 4 | Subject: [PATCH] build: Fix a build race related to utils/mermaid.html.cstr |
| 5 | |
| 6 | Sometimes build fails like below |
| 7 | |
| 8 | | /home/pokybuild/yocto-worker/meta-oe/build/build/tmp/work/core2-64-poky-linux/uftrace/0.13-r0/git/cmds/dump.c: In function 'dump_mermaid_footer': |
| 9 | | /home/pokybuild/yocto-worker/meta-oe/build/build/tmp/work/core2-64-poky-linux/uftrace/0.13-r0/git/cmds/dump.c:1347:10: fatal error: utils/mermaid.html.cstr: No such file or directory |
| 10 | | 1347 | #include "utils/mermaid.html.cstr" /* This file is a converted of mermaid.html to one string literal in build-time */ |
| 11 | | | ^~~~~~~~~~~~~~~~~~~~~~~~~ |
| 12 | | compilation terminated. |
| 13 | | make[1]: *** [Makefile:310: /home/pokybuild/yocto-worker/meta-oe/build/build/tmp/work/core2-64-poky-linux/uftrace/0.13-r0/build/cmds/dump.o] Error 1 |
| 14 | |
| 15 | Create a dependency on c-str-conversion for dump.o |
| 16 | |
| 17 | Upstream-Status: Submitted [https://github.com/namhyung/uftrace/pull/1622] |
| 18 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 19 | --- |
| 20 | Makefile | 2 ++ |
| 21 | 1 file changed, 2 insertions(+) |
| 22 | |
| 23 | diff --git a/Makefile b/Makefile |
| 24 | index 70dc12f0..bb2ac669 100644 |
| 25 | --- a/Makefile |
| 26 | +++ b/Makefile |
| 27 | @@ -304,6 +304,8 @@ $(objdir)/misc/dbginfo.o: $(srcdir)/misc/dbginfo.c $(objdir)/version.h $(COMMON_ |
| 28 | $(objdir)/misc/bench.o: $(srcdir)/misc/bench.c |
| 29 | $(QUIET_CC)$(CC) $(BENCH_CFLAGS) -c -o $@ $< |
| 30 | |
| 31 | +$(objdir)/cmds/dump.o: c-str-conversion |
| 32 | + |
| 33 | $(UFTRACE_OBJS_VERSION): $(objdir)/version.h |
| 34 | |
| 35 | $(filter-out $(objdir)/uftrace.o, $(UFTRACE_OBJS)): $(objdir)/%.o: $(srcdir)/%.c $(COMMON_DEPS) |
| 36 | -- |
| 37 | 2.39.1 |
| 38 | |