| Message ID | 20200921213030.57054-1-fontaine.fabrice@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/1] package/quagga: fix build with gcc 10 | expand |
On Mon, 21 Sep 2020 23:30:30 +0200 Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote: > + struct ethaddr { > + u_char octet[ETHER_ADDR_LEN]; > +-} __packed; I think the intentation was to use the packed gcc attribute, and perhaps in the past there was a __packed defined to __attribute__((packed)) or something like that. When this define went away, __packed became the name of a variable :) That being said, I'm not sure the packed attribute makes anything special on a structure that has a single member, so I've applied. We'll also see what upstream says. Thanks, Thomas
>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes: > Fixes: > - http://autobuild.buildroot.org/results/82b15cff3f7b943eb93d8270790f1b8561d31d6a > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Committed to 2020.08.x, thanks.
diff --git a/package/quagga/0002-lib-prefix.h-fix-build-with-gcc-10.patch b/package/quagga/0002-lib-prefix.h-fix-build-with-gcc-10.patch new file mode 100644 index 0000000000..f2fc9cc647 --- /dev/null +++ b/package/quagga/0002-lib-prefix.h-fix-build-with-gcc-10.patch @@ -0,0 +1,36 @@ +From 01bcd0f7411f86eea44247bf91b48882cae35519 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine <fontaine.fabrice@gmail.com> +Date: Mon, 21 Sep 2020 23:12:25 +0200 +Subject: [PATCH] lib/prefix.h: fix build with gcc 10 + +Remove __packed to fix the following build failure with gcc 10 (which +defaults to -fno-common): + + CCLD libzebra.la +/tmp/instance-1/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: .libs/sockunion.o:(.bss+0x0): multiple definition of `__packed'; .libs/vty.o:(.bss+0x6c): first defined here + +Fixes: + - http://autobuild.buildroot.org/results/82b15cff3f7b943eb93d8270790f1b8561d31d6a + +Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> +[Upstream status: https://bugzilla.quagga.net/show_bug.cgi?id=1014] +--- + lib/prefix.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/prefix.h b/lib/prefix.h +index 2cf0b20b..a5306eee 100644 +--- a/lib/prefix.h ++++ b/lib/prefix.h +@@ -44,7 +44,7 @@ + */ + struct ethaddr { + u_char octet[ETHER_ADDR_LEN]; +-} __packed; ++}; + + + /* +-- +2.28.0 +
Fixes: - http://autobuild.buildroot.org/results/82b15cff3f7b943eb93d8270790f1b8561d31d6a Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> --- ...2-lib-prefix.h-fix-build-with-gcc-10.patch | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 package/quagga/0002-lib-prefix.h-fix-build-with-gcc-10.patch