On Fri, Aug 28, 2020 at 11:54 PM Gianfranco
<[email protected]> wrote:
>
> Upstream commented to use the second one
>
> Signed-off-by: Gianfranco Costamagna <[email protected]>
> Signed-off-by: Gianfranco Costamagna <[email protected]>
> ---
> .../wvdial/wvstreams/ftbfs-gcc-10.patch | 27 ++++++++++
> .../wvdial/wvstreams_4.6.1.bb | 1 +
is this spurious change ?
> .../dlt-daemon/{238.patch => 245.patch} | 53 ++++++++++++++++---
> .../dlt-daemon/dlt-daemon_2.18.5.bb | 2 +-
> 4 files changed, 75 insertions(+), 8 deletions(-)
> create mode 100644
> meta-oe/recipes-connectivity/wvdial/wvstreams/ftbfs-gcc-10.patch
> rename meta-oe/recipes-extended/dlt-daemon/dlt-daemon/{238.patch =>
> 245.patch} (65%)
>
> diff --git a/meta-oe/recipes-connectivity/wvdial/wvstreams/ftbfs-gcc-10.patch
> b/meta-oe/recipes-connectivity/wvdial/wvstreams/ftbfs-gcc-10.patch
> new file mode 100644
> index 000000000..03d2889f1
> --- /dev/null
> +++ b/meta-oe/recipes-connectivity/wvdial/wvstreams/ftbfs-gcc-10.patch
> @@ -0,0 +1,27 @@
> +Description: Fix a build failure with gcc-10.
> + version_major is declared as unsigned int, so "-1" value makes no sense
> here.
> + Also, we don't want to change the variable to a public interface, better
> just ignore this
> + debug use-case nobody probably ever used.
> +Author: Gianfranco Costamagna <[email protected]>
> +Bug-Debian: https://bugs.debian.org/957964
> +Last-Update: 2020-08-15
> +
> +--- wvstreams-4.6.1.orig/xplc/moduleloader.cc
> ++++ wvstreams-4.6.1/xplc/moduleloader.cc
> +@@ -63,11 +63,11 @@ Module* Module::loadModule(const char* m
> + }
> +
> + switch(moduleinfo->version_major) {
> +-#ifdef UNSTABLE
> +- case -1:
> +- /* nothing to do */
> +- break;
> +-#endif
> ++//#ifdef UNSTABLE
> ++// case -1:
> ++// /* nothing to do */
> ++// break;
> ++//#endif
> + default:
> + loaderClose(dlh);
> + return NULL;
> diff --git a/meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb
> b/meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb
> index 20becaf57..15c0a59ee 100644
> --- a/meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb
> +++ b/meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb
> @@ -23,6 +23,7 @@ SRC_URI = "http://${BPN}.googlecode.com/files/${BP}.tar.gz \
> file://openssl-buildfix.patch \
> file://0001-Forward-port-to-OpenSSL-1.1.x.patch \
> file://0001-Fix-narrowing-conversion-error.patch \
> + file://ftbfs-gcc-10.patch \
> "
>
> SRC_URI[md5sum] = "2760dac31a43d452a19a3147bfde571c"
> diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/238.patch
> b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/245.patch
> similarity index 65%
> rename from meta-oe/recipes-extended/dlt-daemon/dlt-daemon/238.patch
> rename to meta-oe/recipes-extended/dlt-daemon/dlt-daemon/245.patch
> index 14c44e6ed..43057489c 100644
> --- a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/238.patch
> +++ b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/245.patch
> @@ -1,6 +1,6 @@
> -From 214f8c71552fc096077f0b916dad75b31eefea3d Mon Sep 17 00:00:00 2001
> +From 57fd61ea5c58a4f9fcd7140b53ac6cd6e971ef47 Mon Sep 17 00:00:00 2001
> From: Gianfranco Costamagna <[email protected]>
> -Date: Fri, 31 Jul 2020 15:26:35 +0200
> +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
> @@ -14,11 +14,26 @@ see bug report:
> https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=957140
> /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/offlinelogstorage/dlt_offline_logstorage.h | 4 ++--
> - 1 file changed, 2 insertions(+), 2 deletions(-)
> + 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..8ad84b8 100644
> +index b58da70..c9bc93b 100644
> --- a/src/offlinelogstorage/dlt_offline_logstorage.h
> +++ b/src/offlinelogstorage/dlt_offline_logstorage.h
> @@ -114,9 +114,9 @@
> @@ -26,10 +41,34 @@ index b58da70..8ad84b8 100644
>
> /* logstorage max cache */
> -unsigned int g_logstorage_cache_max;
> -+static unsigned int g_logstorage_cache_max;
> ++extern unsigned int g_logstorage_cache_max;
> /* current logstorage cache size */
> -unsigned int g_logstorage_cache_size;
> -+static 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)
> + {
> diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.5.bb
> b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.5.bb
> index 3a2b40515..f3fcee4d2 100644
> --- a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.5.bb
> +++ b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.5.bb
> @@ -17,8 +17,8 @@ DEPENDS = "zlib gzip-native"
> SRC_URI = "git://github.com/GENIVI/${BPN}.git;protocol=https \
> file://0002-Don-t-execute-processes-as-a-specific-user.patch \
> file://0004-Modify-systemd-config-directory.patch \
> - file://238.patch \
> file://241.patch \
> + file://245.patch \
> "
> SRCREV = "f1ac087c766827b1d0ed9c3a814b3cc052e948f2"
>
> --
> 2.17.1
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#86687):
https://lists.openembedded.org/g/openembedded-devel/message/86687
Mute This Topic: https://lists.openembedded.org/mt/76490261/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
