Skip to contentSkip to conversation

package/drbd-utils: fix build with gcc 10

PATCH New Fabrice Fontaine 2 participants 2 messages Aug 15, 2020

lore
Share & tools
lore
#0 lore raw

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

Fixes:
- http://autobuild.buildroot.org/results/e444f46cd6e6d767592b17b83095737d0508a475

---
 ...-setup_options-definitions-as-extern.patch | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 package/drbd-utils/0001-v84-Make-setup_options-definitions-as-extern.patch
package/drbd-utils/0001-v84-Make-setup_options-definitions-as-extern.patch new file +31 -0
new file mode 100644
index 0000000000..3a7e32950e
@@ -0,0 +1,31 @@
+From a513dea1cf000164fd87e56525d098a426131a86 Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Wed, 12 Aug 2020 12:59:38 -0700
+Subject: [PATCH] v84: Make setup_options definitions as extern
+
+This is already defined in drbdadm_main.c, therefore make this
+declaration to be extern for other modules
+
+Fixes compatibility with gcc-10 which uses -fno-common by default
+
+Signed-off-by: Khem Raj <[email protected]>
+[Retrieved from:
+https://github.com/LINBIT/drbd-utils/commit/a513dea1cf000164fd87e56525d098a426131a86]
+Signed-off-by: Fabrice Fontaine <[email protected]>
+---
+ user/v84/drbdadm.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/user/v84/drbdadm.h b/user/v84/drbdadm.h
+index ed63d78c..8469f1c4 100644
+--- a/user/v84/drbdadm.h
++++ b/user/v84/drbdadm.h
+@@ -251,7 +251,7 @@ struct setup_option {
+ 	bool explicit;
+ 	char *option;
+ };
+-struct setup_option *setup_options;
++extern struct setup_option *setup_options;
+ 
+ extern void add_setup_option(bool explicit, char *option);
+ 
Signature · 1 line
2.27.0
#1 lore raw

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

Quoted 8 lines · On Sat, 15 Aug 2020 10:20:34 +0200 Fabrice Fontaine…

Fixes:
- http://autobuild.buildroot.org/results/e444f46cd6e6d767592b17b83095737d0508a475

---
 ...-setup_options-definitions-as-extern.patch | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 package/drbd-utils/0001-v84-Make-setup_options-definitions-as-extern.patch

Applied to master, thanks.

Thomas

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