aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenys Dmytriyenko <denys@konsulko.com>2023-06-07 21:33:46 +0000
committerjenkins-dontreply@build.automotivelinux.org <collab-it+agl-jobbuilder@linuxfoundation.org>2024-04-24 15:25:38 +0000
commit83b8f9a263d95ed693f00c1bfbb968de236f736a (patch)
tree053efd3dfd675075b515f6449d52d18a3f2d352e
parentc11d716e3e124d4ee4f156bee9308c68e8036cbc (diff)
kuksa-val: fix breakage with gcc 13
Need to explicitly include fstream header to resolve gcc13 incomplete type error. Bug-AGL: SPEC-4578 Change-Id: I39c867fe48dc07cee3e603bbe222f4392fb808e0 Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
-rw-r--r--recipes-connectivity/kuksa-val/kuksa-val/0006-kuksa-val-server-OverlayLoader-explicitly-include-fs.patch35
-rw-r--r--recipes-connectivity/kuksa-val/kuksa-val_git.bb1
2 files changed, 36 insertions, 0 deletions
diff --git a/recipes-connectivity/kuksa-val/kuksa-val/0006-kuksa-val-server-OverlayLoader-explicitly-include-fs.patch b/recipes-connectivity/kuksa-val/kuksa-val/0006-kuksa-val-server-OverlayLoader-explicitly-include-fs.patch
new file mode 100644
index 000000000..0f40a7c1c
--- /dev/null
+++ b/recipes-connectivity/kuksa-val/kuksa-val/0006-kuksa-val-server-OverlayLoader-explicitly-include-fs.patch
@@ -0,0 +1,35 @@
+From 60561b755cbfbb3aa99b1a0d736cc89540636c00 Mon Sep 17 00:00:00 2001
+From: Denys Dmytriyenko <denys@konsulko.com>
+Date: Wed, 7 Jun 2023 21:16:30 +0000
+Subject: [PATCH] kuksa-val-server: OverlayLoader: explicitly include fstream
+ header
+
+Otherwise gcc13 now errors out:
+
+| .../kuksa-val-server/src/OverlayLoader.cpp: In function 'void applyOverlays(std::shared_ptr<ILogger>, std::vector<boost::filesystem::path>, std::shared_ptr<IVssDatabase>)':
+| .../kuksa-val-server/src/OverlayLoader.cpp:70:24: error: variable 'std::ifstream is' has initializer but incomplete type
+| 70 | std::ifstream is(p.generic_string());
+| | ^
+
+Upstream-Status: Pending
+
+Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
+---
+ kuksa-val-server/src/OverlayLoader.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/kuksa-val-server/src/OverlayLoader.cpp b/kuksa-val-server/src/OverlayLoader.cpp
+index bed9234..abd1945 100644
+--- a/kuksa-val-server/src/OverlayLoader.cpp
++++ b/kuksa-val-server/src/OverlayLoader.cpp
+@@ -23,6 +23,7 @@
+ /* helper fuctions to load overlays during server startup */
+
+ #include <stdexcept>
++#include <fstream>
+ #include <jsoncons/json.hpp>
+
+ #include "OverlayLoader.hpp"
+--
+2.25.1
+
diff --git a/recipes-connectivity/kuksa-val/kuksa-val_git.bb b/recipes-connectivity/kuksa-val/kuksa-val_git.bb
index c564eabfc..64daba228 100644
--- a/recipes-connectivity/kuksa-val/kuksa-val_git.bb
+++ b/recipes-connectivity/kuksa-val/kuksa-val_git.bb
@@ -19,6 +19,7 @@ SRC_URI += "file://kuksa-val.service \
file://0003-Make-install-locations-configurable.patch;patchdir=.. \
file://0004-Disable-default-fetch-and-build-of-googletest.patch;patchdir=.. \
file://0005-kuksa-val-server-Add-missing-check_git-dependency.patch;patchdir=.. \
+ file://0006-kuksa-val-server-OverlayLoader-explicitly-include-fs.patch;patchdir=.. \
"
S = "${WORKDIR}/git/kuksa-val-server"