oasis

commit: e75123286610275c320dafe0b7674f88ec892ba4
parent 1e081a9e9c25e96a44c49a08148833495f2f9a24
Author: Michael Forney <mforney@mforney.org>
Date:   Wed,  5 Feb 2020 18:13:21 -0800

squashfs-tools: Add patch to prevent duplicate globals

Diffstat:
A
pkg/squashfs-tools/patch/0004-squashfs-tools-fix-build-failure-against-gcc-10.patch
47
+++++++++++++++++++++++++++++++++++++++++++++++
M
pkg/squashfs-tools/ver
2
+-

2 files changed, 48 insertions(+), 1 deletion(-)
diff --git a/pkg/squashfs-tools/patch/0004-squashfs-tools-fix-build-failure-against-gcc-10.patch b/pkg/squashfs-tools/patch/0004-squashfs-tools-fix-build-failure-against-gcc-10.patch
@@ -0,0 +1,47 @@
+From 3559270ea30d2252b7007778fdefce530ed07a5e Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Sun, 26 Jan 2020 18:35:13 +0000
+Subject: [PATCH] squashfs-tools: fix build failure against gcc-10
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+Upstream: https://github.com/plougher/squashfs-tools/pull/83
+
+On gcc-10 (and gcc-9 -fno-common) build fails as:
+
+```
+cc ... -o mksquashfs
+ld: read_fs.o:(.bss+0x0):
+  multiple definition of `fwriter_buffer'; mksquashfs.o:(.bss+0x400c90): first defined here
+ld: read_fs.o:(.bss+0x8):
+  multiple definition of `bwriter_buffer'; mksquashfs.o:(.bss+0x400c98): first defined here
+```
+
+gcc-10 will change the default from -fcommon to fno-common:
+https://gcc.gnu.org/PR85678.
+
+The error also happens if CFLAGS=-fno-common passed explicitly.
+
+Reported-by: Toralf Förster
+Bug: https://bugs.gentoo.org/706456
+Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+---
+ squashfs-tools/mksquashfs.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/squashfs-tools/mksquashfs.h b/squashfs-tools/mksquashfs.h
+index 1beefef..b650306 100644
+--- a/squashfs-tools/mksquashfs.h
++++ b/squashfs-tools/mksquashfs.h
+@@ -143,7 +143,7 @@ struct append_file {
+ #endif
+ 
+ extern struct cache *reader_buffer, *fragment_buffer, *reserve_cache;
+-struct cache *bwriter_buffer, *fwriter_buffer;
++extern struct cache *bwriter_buffer, *fwriter_buffer;
+ extern struct queue *to_reader, *to_deflate, *to_writer, *from_writer,
+ 	*to_frag, *locked_fragment, *to_process_frag;
+ extern struct append_file **file_mapping;
+-- 
+2.25.0
+
diff --git a/pkg/squashfs-tools/ver b/pkg/squashfs-tools/ver
@@ -1 +1 @@
-4.4 r1
+4.4 r2