[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: gnu: squashfs-tools: Fix building with address@hidden
From: |
Efraim Flashner |
Subject: |
01/01: gnu: squashfs-tools: Fix building with address@hidden |
Date: |
Thu, 18 Oct 2018 14:32:01 -0400 (EDT) |
efraim pushed a commit to branch core-updates
in repository guix.
commit f793b4ef96d53c548494b4b15b99a31d05c449a3
Author: Efraim Flashner <address@hidden>
Date: Thu Oct 18 21:30:44 2018 +0300
gnu: squashfs-tools: Fix building with address@hidden
* gnu/packages/compression.scm (squashfs-tools)[arguments]: Add
substitution to include missing import. Return #t from all phases.
---
gnu/packages/compression.scm | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index 6ec0813..4137dca 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -7,7 +7,7 @@
;;; Copyright © 2015, 2016, 2017, 2018 Ricardo Wurmus <address@hidden>
;;; Copyright © 2015, 2017, 2018 Leo Famulari <address@hidden>
;;; Copyright © 2015 Jeff Mickey <address@hidden>
-;;; Copyright © 2015, 2016, 2017 Efraim Flashner <address@hidden>
+;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner <address@hidden>
;;; Copyright © 2016 Ben Woodcroft <address@hidden>
;;; Copyright © 2016 Danny Milosavljevic <address@hidden>
;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice <address@hidden>
@@ -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)