01/06: gnu: squashfs-tools: Prepare for GCC 10.

[guix-commits]

mbakke pushed a commit to branch master
in repository guix.

commit 9351b2a48145a690484ff38ace0ccb828c204c09
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Sat May 22 21:33:53 2021 +0200

    gnu: squashfs-tools: Prepare for GCC 10.
    
    * gnu/packages/compression.scm (squashfs-tools)[source](modules, snippet): 
New
    fields.
---
 gnu/packages/compression.scm | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index 746a496..c1996ed 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -863,7 +863,15 @@ time for compression ratio.")
                                   "squashfs" version ".tar.gz"))
               (sha256
                (base32
-                "0zmhvczscqz0mzh4b9m8m42asq14db0a6lc8clp5ljq5ybrv70d9"))))
+                "0zmhvczscqz0mzh4b9m8m42asq14db0a6lc8clp5ljq5ybrv70d9"))
+              (modules '((guix build utils)))
+              (snippet
+               '(begin
+                  ;; Fix build with -fno-common (default in GCC 10).
+                  ;; Remove for squashfs-tools > 4.4.
+                  (substitute* "squashfs-tools/mksquashfs.h"
+                    (("struct cache \\*bwriter_buffer" all)
+                     (string-append "extern " all)))))))
     (build-system gnu-build-system)
     (arguments
      `(#:tests? #f                      ; no check target