nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Efraim Flashner 2018-10-18 21:30:44 +03:00
parent 1febc93f9b
commit f793b4ef96
No known key found for this signature in database
GPG Key ID: 41AAE7DCCA3D8351
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gnu/packages/compression.scm
View File

@ -7,7 +7,7 @@
;;; Copyright © 2015, 2016, 2017, 2018 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015, 2016, 2017, 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015, 2017, 2018 Leo Famulari <leo@famulari.name> ;;; Copyright © 2015, 2017, 2018 Leo Famulari <leo@famulari.name>
;;; Copyright © 2015 Jeff Mickey <j@codemac.net> ;;; 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 Ben Woodcroft <donttrustben@gmail.com>
;;; Copyright © 2016 Danny Milosavljevic <dannym@scratchpost.org> ;;; Copyright © 2016 Danny Milosavljevic <dannym@scratchpost.org>
;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
@ -876,7 +876,15 @@ the LZ4 frame format.")
(modify-phases %standard-phases (modify-phases %standard-phases
(replace 'configure (replace 'configure
(lambda _ (lambda _
(chdir "squashfs-tools")))))) (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 (inputs
`(("lz4" ,lz4) `(("lz4" ,lz4)
("lzo" ,lzo) ("lzo" ,lzo)