summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2020-05-24 10:15:11 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2020-05-24 10:34:55 +0200
commit01a912b9adb55f908a9dc9dfd40a4f20617054e1 (patch)
tree35f57b2e4fe5ab118644e98736bbf3cb450a7c50
parent7990fbf116f66f82796b4d30e24c5e7e8d7189a3 (diff)
downloadptxdist-01a912b9adb55f908a9dc9dfd40a4f20617054e1.tar.gz
squashfs-tools: version bump 4.3 -> 4.4
And add upstream patch to build with gcc 10. Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--patches/squashfs4.3/0001-Use-sysmacros-fixes-build-with-glibc-2.28.patch41
-rw-r--r--patches/squashfs4.3/series4
-rw-r--r--patches/squashfs4.4/0001-squashfs-tools-fix-build-failure-against-gcc-10.patch42
-rw-r--r--patches/squashfs4.4/series4
-rw-r--r--rules/squashfs-tools.make4
5 files changed, 48 insertions, 47 deletions
diff --git a/patches/squashfs4.3/0001-Use-sysmacros-fixes-build-with-glibc-2.28.patch b/patches/squashfs4.3/0001-Use-sysmacros-fixes-build-with-glibc-2.28.patch
deleted file mode 100644
index a8c4d62..0000000
--- a/patches/squashfs4.3/0001-Use-sysmacros-fixes-build-with-glibc-2.28.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From: Gavin Schenk <g.schenk@eckelmann.de>
-Date: Tue, 18 Dec 2018 11:19:47 +0100
-Subject: [PATCH] Use sysmacros fixes build with glibc >= 2.28
-
-From the manpages major, minor, makedev:
-The BSDs expose the definitions for these macros via <sys/types.h>.
-Depending on the version, glibc also exposes definitions for these macros
-from that header file if suitable feature test macros are defined.
-However, this behavior was deprecated in glibc 2.25,
-and since glibc 2.28, <sys/types.h> no longer provides these definitions.
-
-Signed-off-by: Gavin Schenk <g.schenk@eckelmann.de>
----
- squashfs-tools/mksquashfs.c | 1 +
- squashfs-tools/unsquashfs.c | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c
-index 86f82bb92804..84affd4be160 100644
---- a/squashfs-tools/mksquashfs.c
-+++ b/squashfs-tools/mksquashfs.c
-@@ -33,6 +33,7 @@
- #include <unistd.h>
- #include <stdio.h>
- #include <stddef.h>
-+#include <sys/sysmacros.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <fcntl.h>
-diff --git a/squashfs-tools/unsquashfs.c b/squashfs-tools/unsquashfs.c
-index 1323dd6f2cb9..2633e0c0b7ef 100644
---- a/squashfs-tools/unsquashfs.c
-+++ b/squashfs-tools/unsquashfs.c
-@@ -32,6 +32,7 @@
- #include "stdarg.h"
-
- #include <sys/sysinfo.h>
-+#include <sys/sysmacros.h>
- #include <sys/types.h>
- #include <sys/time.h>
- #include <sys/resource.h>
diff --git a/patches/squashfs4.3/series b/patches/squashfs4.3/series
deleted file mode 100644
index c661348..0000000
--- a/patches/squashfs4.3/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-Use-sysmacros-fixes-build-with-glibc-2.28.patch
-# 4b854e836f049da26f6a51c9c416871d - git-ptx-patches magic
diff --git a/patches/squashfs4.4/0001-squashfs-tools-fix-build-failure-against-gcc-10.patch b/patches/squashfs4.4/0001-squashfs-tools-fix-build-failure-against-gcc-10.patch
new file mode 100644
index 0000000..3c6db8f
--- /dev/null
+++ b/patches/squashfs4.4/0001-squashfs-tools-fix-build-failure-against-gcc-10.patch
@@ -0,0 +1,42 @@
+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
+
+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 1beefef70495..b650306360fb 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;
diff --git a/patches/squashfs4.4/series b/patches/squashfs4.4/series
new file mode 100644
index 0000000..32a7a84
--- /dev/null
+++ b/patches/squashfs4.4/series
@@ -0,0 +1,4 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-squashfs-tools-fix-build-failure-against-gcc-10.patch
+# a4fb95a1d871f88525f2f224d1306058 - git-ptx-patches magic
diff --git a/rules/squashfs-tools.make b/rules/squashfs-tools.make
index 034dbfc..6afd44d 100644
--- a/rules/squashfs-tools.make
+++ b/rules/squashfs-tools.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_SQUASHFS_TOOLS) += squashfs-tools
#
# Paths and names
#
-SQUASHFS_TOOLS_VERSION := 4.3
-SQUASHFS_TOOLS_MD5 := d92ab59aabf5173f2a59089531e30dbf
+SQUASHFS_TOOLS_VERSION := 4.4
+SQUASHFS_TOOLS_MD5 := 5033bea6cd522ef54b13755feea6c858
SQUASHFS_TOOLS := squashfs$(SQUASHFS_TOOLS_VERSION)
SQUASHFS_TOOLS_SUFFIX := tar.gz
SQUASHFS_TOOLS_URL := $(call ptx/mirror, SF, squashfs/$(SQUASHFS_TOOLS).$(SQUASHFS_TOOLS_SUFFIX))