Skip to contentSkip to conversation

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

PATCH New Fabrice Fontaine 3 participants 3 messages Sep 23, 2020 – Sep 29, 2020

lore
Share & tools
lore
#0 lore raw

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

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

---
 ...0002-plc-plc.h-fix-build-with-gcc-10.patch | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 package/open-plc-utils/0002-plc-plc.h-fix-build-with-gcc-10.patch
package/open-plc-utils/0002-plc-plc.h-fix-build-with-gcc-10.patch new file +37 -0
new file mode 100644
index 0000000000..063bfc536c
@@ -0,0 +1,37 @@
+From 27222be0b8db59cae30a5fcca93255daea147bb6 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <[email protected]>
+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 <[email protected]>
+[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
+
Signature · 1 line
2.28.0
#1 lore raw

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

Quoted 8 lines · On Wed, 23 Sep 2020 19:16:01 +0200 Fabrice Fontaine…

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

---
 ...0002-plc-plc.h-fix-build-with-gcc-10.patch | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 package/open-plc-utils/0002-plc-plc.h-fix-build-with-gcc-10.patch

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com