summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/squashfs-tools/files
diff options
context:
space:
mode:
authorJacob Kroon <jacob.kroon@gmail.com>2020-05-14 22:49:29 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-05-15 16:31:45 +0100
commit448dadd32c939a6eb98e5229b9f7d2b5bc945371 (patch)
tree806f0550b6aa1da51455ebf602dad1294c25b603 /meta/recipes-devtools/squashfs-tools/files
parent987b531efffd0cb3688a5a17ad8bc4a87d702bbf (diff)
downloadpoky-448dadd32c939a6eb98e5229b9f7d2b5bc945371.tar.gz
squashfs-tools: Backport fix for compiling with gcc 10
(From OE-Core rev: bae1603a27fadcfa7257801167f28db3ff02dc97) Signed-off-by: Jacob Kroon <jacob.kroon@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/squashfs-tools/files')
-rw-r--r--meta/recipes-devtools/squashfs-tools/files/0001-squashfs-tools-fix-build-failure-against-gcc-10.patch45
1 files changed, 45 insertions, 0 deletions
diff --git a/meta/recipes-devtools/squashfs-tools/files/0001-squashfs-tools-fix-build-failure-against-gcc-10.patch b/meta/recipes-devtools/squashfs-tools/files/0001-squashfs-tools-fix-build-failure-against-gcc-10.patch
new file mode 100644
index 0000000000..fc881862ea
--- /dev/null
+++ b/meta/recipes-devtools/squashfs-tools/files/0001-squashfs-tools-fix-build-failure-against-gcc-10.patch
@@ -0,0 +1,45 @@
1From 94e1911ca24726b7cb3efe2f8b9eb7a784757e18 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>
27Signed-off-by: Jacob Kroon <jacob.kroon@gmail.com>
28Upstream-Status: Backport [https://github.com/plougher/squashfs-tools/commit/fe2f5da4b0f8994169c53e84b7cb8a0feefc97b5]
29---
30 squashfs-tools/mksquashfs.h | 2 +-
31 1 file changed, 1 insertion(+), 1 deletion(-)
32
33diff --git a/squashfs-tools/mksquashfs.h b/squashfs-tools/mksquashfs.h
34index 1beefef..b650306 100644
35--- a/squashfs-tools/mksquashfs.h
36+++ b/squashfs-tools/mksquashfs.h
37@@ -143,7 +143,7 @@ struct append_file {
38 #endif
39
40 extern struct cache *reader_buffer, *fragment_buffer, *reserve_cache;
41-struct cache *bwriter_buffer, *fwriter_buffer;
42+extern struct cache *bwriter_buffer, *fwriter_buffer;
43 extern struct queue *to_reader, *to_deflate, *to_writer, *from_writer,
44 *to_frag, *locked_fragment, *to_process_frag;
45 extern struct append_file **file_mapping;