mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-30 05:51:45 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/open-plc-utils: fix build with gcc 10

Browse Source 
Fixes:
 - http://autobuild.buildroot.org/results/6b3064b64dea3d4aaf219f787429c25918101483

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 86ae2856d8)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Fabrice Fontaine
2020-09-23 19:16:01 +02:00
committed by Peter Korsgaard
parent e83d25e018
commit d5348fca84
1 changed files with 37 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
package/open-plc-utils/0002-plc-plc.h-fix-build-with-gcc-10.patch Normal file
View File

@@ -0,0 +1,37 @@
From 27222be0b8db59cae30a5fcca93255daea147bb6 Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Wed, 23 Sep 2020 19:05:23 +0200
Subject: [PATCH] plc/plc.h: fix build with gcc 10
Drop plcproperty from plc/plc.h to avoid the following build failure
with gcc 10 (which defaults to -fno-common):
/home/buildroot/autobuild/run/instance-3/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: rules.o:(.bss+0x0): multiple definition of `plcproperty'; pibruin.o:(.bss+0x0): first defined here
Fixes:
- http://autobuild.buildroot.org/results/6b3064b64dea3d4aaf219f787429c25918101483
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[Upstream status: https://github.com/qca/open-plc-utils/pull/141]
---
plc/plc.h | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/plc/plc.h b/plc/plc.h
index 1fa32b53..208cf91a 100644
--- a/plc/plc.h
+++ b/plc/plc.h
@@ -496,9 +496,7 @@ struct __packed plcproperty
uint8_t DATA_FORMAT;
uint32_t DATA_LENGTH;
uint8_t DATA_BUFFER [128];
-}
-
-plcproperty;
+};
#ifndef __GNUC__
#pragma pack (pop)
--
2.28.0