<div dir="ltr"><div dir="ltr"><br></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Fri, Mar 20, 2020 at 10:11 PM Paul Spooren <<a href="mailto:mail@aparcar.org">mail@aparcar.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">Hi,<br>
<br>
wan't squashfskit4 created as a workaround for an inactive upstream<br>
maintainer? Wouldn't it make sense to move back to upstream now that it<br>
is more up to date than our fork?<br>
<br>
Best,<br>
Paul<br></blockquote><div>Sorry, I did not know about that situation but after a look it seems that squashfs-tools is more up to date that the fork.</div><div>There has been a 4.4 release and couple of patches each month to it.</div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
<br>
On Thu Mar 19, 2020 at 2:22 AM PST, Robert Marko wrote:<br>
> From: Robert Marko <<a href="mailto:robert.marko@sartura.hr" target="_blank">robert.marko@sartura.hr</a>><br>
><br>
> In order to build squashfskit with GCC10, this backport from upstream is<br>
> needed.<br>
><br>
> Signed-off-by: Robert Marko <<a href="mailto:robert.marko@sartura.hr" target="_blank">robert.marko@sartura.hr</a>><br>
> ---<br>
> ...002-fix-build-failure-against-gcc-10.patch | 43 +++++++++++++++++++<br>
> 1 file changed, 43 insertions(+)<br>
> create mode 100644<br>
> tools/squashfskit4/patches/0002-fix-build-failure-against-gcc-10.patch<br>
><br>
> diff --git<br>
> a/tools/squashfskit4/patches/0002-fix-build-failure-against-gcc-10.patch<br>
> b/tools/squashfskit4/patches/0002-fix-build-failure-against-gcc-10.patch<br>
> new file mode 100644<br>
> index 0000000000..46c6a5ea0f<br>
> --- /dev/null<br>
> +++<br>
> b/tools/squashfskit4/patches/0002-fix-build-failure-against-gcc-10.patch<br>
> @@ -0,0 +1,43 @@<br>
> +From fe2f5da4b0f8994169c53e84b7cb8a0feefc97b5 Mon Sep 17 00:00:00 2001<br>
> +From: Sergei Trofimovich <<a href="mailto:slyfox@gentoo.org" target="_blank">slyfox@gentoo.org</a>><br>
> +Date: Sun, 26 Jan 2020 18:35:13 +0000<br>
> +Subject: [PATCH] squashfs-tools: fix build failure against gcc-10<br>
> +MIME-Version: 1.0<br>
> +Content-Type: text/plain; charset=UTF-8<br>
> +Content-Transfer-Encoding: 8bit<br>
> +<br>
> +On gcc-10 (and gcc-9 -fno-common) build fails as:<br>
> +<br>
> +```<br>
> +cc ... -o mksquashfs<br>
> +ld: read_fs.o:(.bss+0x0):<br>
> + multiple definition of `fwriter_buffer'; mksquashfs.o:(.bss+0x400c90):<br>
> first defined here<br>
> +ld: read_fs.o:(.bss+0x8):<br>
> + multiple definition of `bwriter_buffer'; mksquashfs.o:(.bss+0x400c98):<br>
> first defined here<br>
> +```<br>
> +<br>
> +gcc-10 will change the default from -fcommon to fno-common:<br>
> +<a href="https://gcc.gnu.org/PR85678" rel="noreferrer" target="_blank">https://gcc.gnu.org/PR85678</a>.<br>
> +<br>
> +The error also happens if CFLAGS=-fno-common passed explicitly.<br>
> +<br>
> +Reported-by: Toralf Förster<br>
> +Bug: <a href="https://bugs.gentoo.org/706456" rel="noreferrer" target="_blank">https://bugs.gentoo.org/706456</a><br>
> +Signed-off-by: Sergei Trofimovich <<a href="mailto:slyfox@gentoo.org" target="_blank">slyfox@gentoo.org</a>><br>
> +---<br>
> + squashfs-tools/mksquashfs.h | 2 +-<br>
> + 1 file changed, 1 insertion(+), 1 deletion(-)<br>
> +<br>
> +diff --git a/squashfs-tools/mksquashfs.h b/squashfs-tools/mksquashfs.h<br>
> +index 1beefef7..b6503063 100644<br>
> +--- a/squashfs-tools/mksquashfs.h<br>
> ++++ b/squashfs-tools/mksquashfs.h<br>
> +@@ -143,7 +143,7 @@ struct append_file {<br>
> + #endif<br>
> +<br>
> + extern struct cache *reader_buffer, *fragment_buffer, *reserve_cache;<br>
> +-struct cache *bwriter_buffer, *fwriter_buffer;<br>
> ++extern struct cache *bwriter_buffer, *fwriter_buffer;<br>
> + extern struct queue *to_reader, *to_deflate, *to_writer, *from_writer,<br>
> + *to_frag, *locked_fragment, *to_process_frag;<br>
> + extern struct append_file **file_mapping;<br>
> --<br>
> 2.26.0.rc2<br>
><br>
><br>
> _______________________________________________<br>
> openwrt-devel mailing list<br>
> <a href="mailto:openwrt-devel@lists.openwrt.org" target="_blank">openwrt-devel@lists.openwrt.org</a><br>
> <a href="https://lists.openwrt.org/mailman/listinfo/openwrt-devel" rel="noreferrer" target="_blank">https://lists.openwrt.org/mailman/listinfo/openwrt-devel</a><br>
<br>
</blockquote></div></div>