[meta-oe][PATCH 1/2] uftreace: Fix a build race

[meta-oe][PATCH 1/2] uftreace: Fix a build race

[Khem Raj]

Fixes a build race seen after 0.13 upgrade

| /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':
| /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
|  1347 | #include "utils/mermaid.html.cstr" /* This file is a converted of mermaid.html to one string literal in build-time */
|       |          ^~~~~~~~~~~~~~~~~~~~~~~~~
| compilation terminated.
| 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

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ...e-related-to-utils-mermaid.html.cstr.patch | 38 +++++++++++++++++++
 .../recipes-devtools/uftrace/uftrace_0.13.bb  |  1 +
 2 files changed, 39 insertions(+)
 create mode 100644 meta-oe/recipes-devtools/uftrace/uftrace/0001-Fix-a-build-race-related-to-utils-mermaid.html.cstr.patch

diff --git a/meta-oe/recipes-devtools/uftrace/uftrace/0001-Fix-a-build-race-related-to-utils-mermaid.html.cstr.patch b/meta-oe/recipes-devtools/uftrace/uftrace/0001-Fix-a-build-race-related-to-utils-mermaid.html.cstr.patch
new file mode 100644
index 0000000000..3e003e0e8f
--- /dev/null
+++ b/meta-oe/recipes-devtools/uftrace/uftrace/0001-Fix-a-build-race-related-to-utils-mermaid.html.cstr.patch
@@ -0,0 +1,38 @@
+From 0996625e71e5f726b8829f01d87ff85446453378 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 21 Jan 2023 10:35:46 -0800
+Subject: [PATCH] Fix a build race related to utils/mermaid.html.cstr
+
+Sometimes build fails like below
+
+| /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':
+| /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
+|  1347 | #include "utils/mermaid.html.cstr" /* This file is a converted of mermaid.html to one string literal in build-time */
+|       |          ^~~~~~~~~~~~~~~~~~~~~~~~~
+| compilation terminated.
+| 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
+
+Create a dependency on c-str-conversion for dump.o
+
+Upstream-Status: Submitted [https://github.com/namhyung/uftrace/pull/1622]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 70dc12f0..1eaf1663 100644
+--- a/Makefile
++++ b/Makefile
+@@ -304,7 +304,7 @@ $(objdir)/misc/dbginfo.o: $(srcdir)/misc/dbginfo.c $(objdir)/version.h $(COMMON_
+ $(objdir)/misc/bench.o: $(srcdir)/misc/bench.c
+ 	$(QUIET_CC)$(CC) $(BENCH_CFLAGS) -c -o $@ $<
+ 
+-$(UFTRACE_OBJS_VERSION): $(objdir)/version.h
++$(UFTRACE_OBJS_VERSION): $(objdir)/version.h c-str-conversion
+ 
+ $(filter-out $(objdir)/uftrace.o, $(UFTRACE_OBJS)): $(objdir)/%.o: $(srcdir)/%.c $(COMMON_DEPS)
+ 	$(QUIET_CC)$(CC) $(UFTRACE_CFLAGS) -c -o $@ $<
+-- 
+2.39.1
+
diff --git a/meta-oe/recipes-devtools/uftrace/uftrace_0.13.bb b/meta-oe/recipes-devtools/uftrace/uftrace_0.13.bb
index a429f7948e..51ebb722a6 100644
--- a/meta-oe/recipes-devtools/uftrace/uftrace_0.13.bb
+++ b/meta-oe/recipes-devtools/uftrace/uftrace_0.13.bb
@@ -12,6 +12,7 @@ inherit autotools
 
 SRCREV = "53ec12d40701cf73ddcf5db8cff63b54736d0eda"
 SRC_URI = "git://github.com/namhyung/${BPN};branch=master;protocol=https \
+           file://0001-Fix-a-build-race-related-to-utils-mermaid.html.cstr.patch \
            "
 S = "${WORKDIR}/git"
 
-- 
2.39.1

[meta-oe][PATCH 2/2] sdbus-c++: Disable ccache

[Khem Raj]

It adds spurious -isystem from somewhere else

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta-oe/recipes-core/sdbus-c++/sdbus-c++_1.2.0.bb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta-oe/recipes-core/sdbus-c++/sdbus-c++_1.2.0.bb b/meta-oe/recipes-core/sdbus-c++/sdbus-c++_1.2.0.bb
index 75cd815535..2fb975ced6 100644
--- a/meta-oe/recipes-core/sdbus-c++/sdbus-c++_1.2.0.bb
+++ b/meta-oe/recipes-core/sdbus-c++/sdbus-c++_1.2.0.bb
@@ -42,3 +42,6 @@ do_install:append() {
 PTEST_PATH = "${libdir}/${BPN}/tests"
 FILES:${PN}-ptest =+ "${sysconfdir}/dbus-1/system.d/"
 FILES:${PN}-dev += "${bindir}/sdbus-c++-xml2cpp"
+
+# It adds -isystem which is spurious, no idea where it gets it from
+CCACHE_DISABLE = "1"
-- 
2.39.1