[Buildroot] [PATCH 1/1] package/neardal: fix build with gcc 10

[Buildroot] [PATCH 1/1] package/neardal: fix build with gcc 10

[Fabrice Fontaine]

Fixes:
 - http://autobuild.buildroot.org/results/7efb100c899b67ffd570f73c202442f95ca5397e

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 ...-lib-neardal.h-fix-build-with-gcc-10.patch | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 package/neardal/0001-lib-neardal.h-fix-build-with-gcc-10.patch

diff --git a/package/neardal/0001-lib-neardal.h-fix-build-with-gcc-10.patch b/package/neardal/0001-lib-neardal.h-fix-build-with-gcc-10.patch
new file mode 100644
index 0000000000..c9c4555022
--- /dev/null
+++ b/package/neardal/0001-lib-neardal.h-fix-build-with-gcc-10.patch
@@ -0,0 +1,35 @@
+From 08467411d7dfc2a2b7ede62e5fdc640748ea1db2 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Wed, 9 Sep 2020 19:14:52 +0200
+Subject: [PATCH] lib/neardal.h: fix build with gcc 10
+
+Define neardal_output_cb as extern to avoid the following build failure
+with gcc 10 (which defaults to -fno-common):
+
+/srv/storage/autobuild/run/instance-2/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: ./.libs/neardal_adapter.o:(.bss+0x0): multiple definition of `neardal_output_cb'; ./.libs/neardal.o:(.bss+0x68): first defined here
+
+Fixes:
+ - http://autobuild.buildroot.org/results/7efb100c899b67ffd570f73c202442f95ca5397e
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+[Upstream status: https://github.com/connectivity/neardal/pull/10]
+---
+ lib/neardal.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/neardal.h b/lib/neardal.h
+index d1cd18b..3e83595 100644
+--- a/lib/neardal.h
++++ b/lib/neardal.h
+@@ -638,7 +638,7 @@ neardal_record *neardal_g_variant_to_record(GVariant *in);
+ 
+ void neardal_trace(const char *func, FILE *fp, char *fmt, ...)
+ 	__attribute__((format(printf, 3, 4)));
+-int (*neardal_output_cb)(FILE *fp, const char *fmt, va_list ap);
++extern int (*neardal_output_cb)(FILE *fp, const char *fmt, va_list ap);
+ 
+ #ifdef __cplusplus
+ }
+-- 
+2.28.0
+
-- 
2.28.0

[Buildroot] [PATCH 1/1] package/neardal: fix build with gcc 10

[Arnout Vandecappelle]

On 09/09/2020 20:21, Fabrice Fontaine wrote:
> Fixes:
>  - http://autobuild.buildroot.org/results/7efb100c899b67ffd570f73c202442f95ca5397e
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

 Applied to master, thanks.

 Regards,
 Arnout

> ---
>  ...-lib-neardal.h-fix-build-with-gcc-10.patch | 35 +++++++++++++++++++
>  1 file changed, 35 insertions(+)
>  create mode 100644 package/neardal/0001-lib-neardal.h-fix-build-with-gcc-10.patch
> 
> diff --git a/package/neardal/0001-lib-neardal.h-fix-build-with-gcc-10.patch b/package/neardal/0001-lib-neardal.h-fix-build-with-gcc-10.patch
> new file mode 100644
> index 0000000000..c9c4555022
> --- /dev/null
> +++ b/package/neardal/0001-lib-neardal.h-fix-build-with-gcc-10.patch
> @@ -0,0 +1,35 @@
> +From 08467411d7dfc2a2b7ede62e5fdc640748ea1db2 Mon Sep 17 00:00:00 2001
> +From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> +Date: Wed, 9 Sep 2020 19:14:52 +0200
> +Subject: [PATCH] lib/neardal.h: fix build with gcc 10
> +
> +Define neardal_output_cb as extern to avoid the following build failure
> +with gcc 10 (which defaults to -fno-common):
> +
> +/srv/storage/autobuild/run/instance-2/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: ./.libs/neardal_adapter.o:(.bss+0x0): multiple definition of `neardal_output_cb'; ./.libs/neardal.o:(.bss+0x68): first defined here
> +
> +Fixes:
> + - http://autobuild.buildroot.org/results/7efb100c899b67ffd570f73c202442f95ca5397e
> +
> +Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> +[Upstream status: https://github.com/connectivity/neardal/pull/10]
> +---
> + lib/neardal.h | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/lib/neardal.h b/lib/neardal.h
> +index d1cd18b..3e83595 100644
> +--- a/lib/neardal.h
> ++++ b/lib/neardal.h
> +@@ -638,7 +638,7 @@ neardal_record *neardal_g_variant_to_record(GVariant *in);
> + 
> + void neardal_trace(const char *func, FILE *fp, char *fmt, ...)
> + 	__attribute__((format(printf, 3, 4)));
> +-int (*neardal_output_cb)(FILE *fp, const char *fmt, va_list ap);
> ++extern int (*neardal_output_cb)(FILE *fp, const char *fmt, va_list ap);
> + 
> + #ifdef __cplusplus
> + }
> +-- 
> +2.28.0
> +
> 

[Buildroot] [PATCH 1/1] package/neardal: fix build with gcc 10

[Peter Korsgaard]

>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:

 > Fixes:
 >  - http://autobuild.buildroot.org/results/7efb100c899b67ffd570f73c202442f95ca5397e

 > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Committed to 2020.08.x, thanks.

-- 
Bye, Peter Korsgaard