diff options
author | Gianfranco Costamagna <costamagna.gianfranco@gmail.com> | 2020-08-29 10:00:38 +0200 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2021-09-05 09:52:37 -0700 |
commit | 5d6945d7807bcb638bf571c607f4d9369cb5ab46 (patch) | |
tree | e0382bcb9a35051d7dd6acfe1d626c1a1ea7f90a /meta-oe/recipes-extended/dlt-daemon/dlt-daemon/245.patch | |
parent | 638f787f746e195d011dfb70f6a6ac557b80e110 (diff) | |
download | meta-openembedded-5d6945d7807bcb638bf571c607f4d9369cb5ab46.tar.gz |
dlt-daemon: superseed upstream pr #238 patch with pr #245 due to unexpected behaviour
Upstream commented to use the second one
Signed-off-by: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Signed-off-by: Gianfranco Costamagna <locutusofborg@debian.org>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit c32d2eb448ce343463dc75cc6120f395e32f0177)
[Fixup for Dunfell context]
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-oe/recipes-extended/dlt-daemon/dlt-daemon/245.patch')
-rw-r--r-- | meta-oe/recipes-extended/dlt-daemon/dlt-daemon/245.patch | 74 |
1 files changed, 74 insertions, 0 deletions
diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/245.patch b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/245.patch new file mode 100644 index 0000000000..43057489c9 --- /dev/null +++ b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/245.patch @@ -0,0 +1,74 @@ +From 57fd61ea5c58a4f9fcd7140b53ac6cd6e971ef47 Mon Sep 17 00:00:00 2001 +From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it> +Date: Fri, 31 Jul 2020 15:16:02 +0200 +Subject: [PATCH] dlt_offline: fix build failures with gcc-10 + +see bug report: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=957140 + +/usr/bin/ld: CMakeFiles/dlt-daemon.dir/dlt_daemon_client.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:116: multiple definition of `g_logstorage_cache_max'; CMakeFiles/dlt-daemon.dir/dlt-daemon.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:116: first defined here +/usr/bin/ld: CMakeFiles/dlt-daemon.dir/dlt_daemon_common.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:118: multiple definition of `g_logstorage_cache_size'; CMakeFiles/dlt-daemon.dir/dlt-daemon.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:118: first defined here +/usr/bin/ld: CMakeFiles/dlt-daemon.dir/dlt_daemon_common.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:116: multiple definition of `g_logstorage_cache_max'; CMakeFiles/dlt-daemon.dir/dlt-daemon.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:116: first defined here +/usr/bin/ld: CMakeFiles/dlt-daemon.dir/dlt_daemon_connection.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:118: multiple definition of `g_logstorage_cache_size'; CMakeFiles/dlt-daemon.dir/dlt-daemon.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:118: first defined here +/usr/bin/ld: CMakeFiles/dlt-daemon.dir/dlt_daemon_connection.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:116: multiple definition of `g_logstorage_cache_max'; CMakeFiles/dlt-daemon.dir/dlt-daemon.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:116: first defined here +/usr/bin/ld: CMakeFiles/dlt-daemon.dir/dlt_daemon_event_handler.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:118: multiple definition of `g_logstorage_cache_size'; CMakeFiles/dlt-daemon.dir/dlt-daemon.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:118: first defined here +/usr/bin/ld: CMakeFiles/dlt-daemon.dir/dlt_daemon_event_handler.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:116: multiple definition of `g_logstorage_cache_max'; CMakeFiles/dlt-daemon.dir/dlt-daemon.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:116: first defined here +/usr/bin/ld: CMakeFiles/dlt-daemon.dir/dlt_daemon_offline_logstorage.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:116: multiple definition of `g_logstorage_cache_max'; CMakeFiles/dlt-daemon.dir/dlt-daemon.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:116: first defined here +--- + src/daemon/dlt_daemon_offline_logstorage.c | 1 + + src/offlinelogstorage/dlt_offline_logstorage.h | 4 ++-- + src/offlinelogstorage/dlt_offline_logstorage_behavior.c | 1 + + tests/gtest_dlt_daemon_offline_log.cpp | 1 + + 4 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/src/daemon/dlt_daemon_offline_logstorage.c b/src/daemon/dlt_daemon_offline_logstorage.c +index 0b3c14f..db9637e 100644 +--- a/src/daemon/dlt_daemon_offline_logstorage.c ++++ b/src/daemon/dlt_daemon_offline_logstorage.c +@@ -56,6 +56,7 @@ DLT_STATIC DltReturnValue dlt_logstorage_split_ecuid(char *key, + return DLT_RETURN_OK; + } + ++unsigned int g_logstorage_cache_max; + /** + * dlt_logstorage_split_ctid + * +diff --git a/src/offlinelogstorage/dlt_offline_logstorage.h b/src/offlinelogstorage/dlt_offline_logstorage.h +index b58da70..c9bc93b 100644 +--- a/src/offlinelogstorage/dlt_offline_logstorage.h ++++ b/src/offlinelogstorage/dlt_offline_logstorage.h +@@ -114,9 +114,9 @@ + #define DLT_OFFLINE_LOGSTORAGE_IS_STRATEGY_SET(S, s) ((S)&(s)) + + /* logstorage max cache */ +-unsigned int g_logstorage_cache_max; ++extern unsigned int g_logstorage_cache_max; + /* current logstorage cache size */ +-unsigned int g_logstorage_cache_size; ++extern unsigned int g_logstorage_cache_size; + + typedef struct + { +diff --git a/src/offlinelogstorage/dlt_offline_logstorage_behavior.c b/src/offlinelogstorage/dlt_offline_logstorage_behavior.c +index afbf8c4..edef482 100644 +--- a/src/offlinelogstorage/dlt_offline_logstorage_behavior.c ++++ b/src/offlinelogstorage/dlt_offline_logstorage_behavior.c +@@ -32,6 +32,7 @@ + #include "dlt_offline_logstorage_behavior.h" + #include "dlt_offline_logstorage_behavior_internal.h" + ++unsigned int g_logstorage_cache_size; + /** + * dlt_logstorage_log_file_name + * +diff --git a/tests/gtest_dlt_daemon_offline_log.cpp b/tests/gtest_dlt_daemon_offline_log.cpp +index b8965de..0bd4d5e 100644 +--- a/tests/gtest_dlt_daemon_offline_log.cpp ++++ b/tests/gtest_dlt_daemon_offline_log.cpp +@@ -29,6 +29,7 @@ extern "C" + #include <fcntl.h> + } + ++unsigned int g_logstorage_cache_max; + /* Begin Method: dlt_logstorage::t_dlt_logstorage_list_add*/ + TEST(t_dlt_logstorage_list_add, normal) + { |