aboutsummaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorMarius Bakke <marius@gnu.org>2021-05-22 21:33:53 +0200
committerMarius Bakke <marius@gnu.org>2021-05-23 17:49:56 +0200
commit9351b2a48145a690484ff38ace0ccb828c204c09 (patch)
tree94b397784d6f3dd4e63a33057aa883e66793cea2 /gnu
parentd49402ab45486347cddfd000951a69f0c872cfda (diff)
downloadguix-9351b2a48145a690484ff38ace0ccb828c204c09.tar
guix-9351b2a48145a690484ff38ace0ccb828c204c09.tar.gz
gnu: squashfs-tools: Prepare for GCC 10.
* gnu/packages/compression.scm (squashfs-tools)[source](modules, snippet): New fields.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/compression.scm10
1 files changed, 9 insertions, 1 deletions
diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index 746a496c90..c1996edbec 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