aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEfraim Flashner <efraim@flashner.co.il>2018-10-18 21:30:44 +0300
committerEfraim Flashner <efraim@flashner.co.il>2018-10-18 21:31:52 +0300
commitf793b4ef96d53c548494b4b15b99a31d05c449a3 (patch)
tree99b4ca597bafa2fc3103d751236eb02c75ea1a14
parent1febc93f9b13155be7a212fcaf93d5dd181c8aea (diff)
downloadpatches-f793b4ef96d53c548494b4b15b99a31d05c449a3.tar
patches-f793b4ef96d53c548494b4b15b99a31d05c449a3.tar.gz
gnu: squashfs-tools: Fix building with glibc@2.28.
* gnu/packages/compression.scm (squashfs-tools)[arguments]: Add substitution to include missing import. Return #t from all phases.
-rw-r--r--gnu/packages/compression.scm14
1 files changed, 11 insertions, 3 deletions
diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index 6ec08136d5..4137dca8bb 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -7,7 +7,7 @@
;;; Copyright © 2015, 2016, 2017, 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015, 2017, 2018 Leo Famulari <leo@famulari.name>
;;; Copyright © 2015 Jeff Mickey <j@codemac.net>
-;;; Copyright © 2015, 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com>
;;; Copyright © 2016 Danny Milosavljevic <dannym@scratchpost.org>
;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
@@ -875,8 +875,16 @@ the LZ4 frame format.")
#:phases
(modify-phases %standard-phases
(replace 'configure
- (lambda _
- (chdir "squashfs-tools"))))))
+ (lambda _
+ (chdir "squashfs-tools")
+ #t))
+ (add-after 'unpack 'fix-glibc-compatability
+ (lambda _
+ (substitute* '("squashfs-tools/mksquashfs.c"
+ "squashfs-tools/unsquashfs.c")
+ (("<sys/sysinfo.h>")
+ "<sys/sysinfo.h>\n#include <sys/sysmacros.h>"))
+ #t)))))
(inputs
`(("lz4" ,lz4)
("lzo" ,lzo)