1From e1cdcfd94172a0b1ba4c9df70f4d69a41c687404 Mon Sep 17 00:00:00 2001
2From: Sergei Trofimovich <slyfox@gentoo.org>
3Date: Sun, 26 Jan 2020 18:35:13 +0000
4Subject: [PATCH] squashfs-tools: fix build failure against gcc-10
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9On gcc-10 (and gcc-9 -fno-common) build fails as:
10
11```
12cc ... -o mksquashfs
13ld: read_fs.o:(.bss+0x0):
14  multiple definition of `fwriter_buffer'; mksquashfs.o:(.bss+0x400c90): first defined here
15ld: read_fs.o:(.bss+0x8):
16  multiple definition of `bwriter_buffer'; mksquashfs.o:(.bss+0x400c98): first defined here
17```
18
19gcc-10 will change the default from -fcommon to fno-common:
20https://gcc.gnu.org/PR85678.
21
22The error also happens if CFLAGS=-fno-common passed explicitly.
23
24Reported-by: Toralf Förster
25Bug: https://bugs.gentoo.org/706456
26Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
27
28[Upstream: https://github.com/plougher/squashfs-tools/commit/fe2f5da4b0f8994169c53e84b7cb8a0feefc97b5.patch]
29Signed-off-by: Peter Seiderer <ps.report@gmx.net>
30---
31 squashfs-tools/mksquashfs.h | 2 +-
32 1 file changed, 1 insertion(+), 1 deletion(-)
33
34diff --git a/squashfs-tools/mksquashfs.h b/squashfs-tools/mksquashfs.h
35index 1beefef..b650306 100644
36--- a/squashfs-tools/mksquashfs.h
37+++ b/squashfs-tools/mksquashfs.h
38@@ -143,7 +143,7 @@ struct append_file {
39 #endif
40
41 extern struct cache *reader_buffer, *fragment_buffer, *reserve_cache;
42-struct cache *bwriter_buffer, *fwriter_buffer;
43+extern struct cache *bwriter_buffer, *fwriter_buffer;
44 extern struct queue *to_reader, *to_deflate, *to_writer, *from_writer,
45 	*to_frag, *locked_fragment, *to_process_frag;
46 extern struct append_file **file_mapping;
47--
482.26.2
49
50