me
/
guix
Archived
1
0
Fork 0
Code

gnu: e2fsprogs: Update to 1.43.4. 

* gnu/packages/linux.scm (e2fsprogs, e2fsprogs/static, e2fsck/static): Update
to 1.43.4.
[source]: Remove obsolete gzip substitution. Move '/bin/sh' substitution to ...
[arguments] ... here. Move LDFLAGS from #:make-flags to #:configure-flags.
Enable parallel build.
master
Marius Bakke 2017-05-10 15:48:38 +02:00
parent 55acb372e3
commit b047a86b6c
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 18 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
gnu/packages/linux.scm
View File

@ -646,7 +646,7 @@ slabtop, and skill.")
(define-public e2fsprogs (define-public e2fsprogs
(package (package
(name "e2fsprogs") (name "e2fsprogs")
(version "1.42.13") (version "1.43.4")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -655,45 +655,30 @@ slabtop, and skill.")
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1ix0b83zgw5n0p2grh2961c6796m92yr2jqc2sbr23x3lfsp8r71")) "092absr4vrlqrkdf9nwh4ykj40ab6hhwrkdr6sjsccd54c8z5csl"))))
(modules '((guix build utils)))
(snippet
'(begin
(substitute* "MCONFIG.in"
(("INSTALL_SYMLINK = /bin/sh")
"INSTALL_SYMLINK = sh"))
;; Do not include a timestamp in libext2fs.info.gz.
(substitute* "doc/Makefile.in"
(("gzip -9")
"gzip -9n"))))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs `(("util-linux" ,util-linux))) (inputs `(("util-linux" ,util-linux)))
(native-inputs `(("pkg-config" ,pkg-config) (native-inputs `(("pkg-config" ,pkg-config)
("texinfo" ,texinfo))) ;for the libext2fs Info manual ("texinfo" ,texinfo))) ;for the libext2fs Info manual
(arguments (arguments
'(;; Parallel building reliably yields a failure like this: '(;; util-linux is the preferred source for some of the libraries and
;; "make[2]: *** No rule to make target '../lib/libss.so', needed by
;; 'debugfs'. Stop."
#:parallel-build? #f
;; util-linux is the preferred source for some of the libraries and
;; commands, so disable them (see, e.g., ;; commands, so disable them (see, e.g.,
;; <http://git.buildroot.net/buildroot/commit/?id=e1ffc2f791b33633>.) ;; <http://git.buildroot.net/buildroot/commit/?id=e1ffc2f791b33633>.)
#:configure-flags '("--disable-libblkid" #:configure-flags (list "--disable-libblkid"
"--disable-libuuid" "--disable-uuidd" "--disable-libuuid" "--disable-uuidd"
"--disable-fsck" "--disable-fsck"
;; Use symlinks instead of hard links for ;; Use symlinks instead of hard links for
;; 'fsck.extN' etc. This makes the resulting nar ;; 'fsck.extN' etc. This makes the resulting nar
;; smaller and is preserved across copies. ;; smaller and is preserved across copies.
"--enable-symlink-install" "--enable-symlink-install"
;; Install libext2fs et al. (string-append "LDFLAGS=-Wl,-rpath="
"--enable-elf-shlibs") (assoc-ref %outputs "out")
"/lib")
#:make-flags (list (string-append "LDFLAGS=-Wl,-rpath=" ;; Install libext2fs et al.
(assoc-ref %outputs "out") "--enable-elf-shlibs")
"/lib"))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
@ -703,6 +688,9 @@ slabtop, and skill.")
(("/bin/sh (.*)parse-types.sh" _ dir) (("/bin/sh (.*)parse-types.sh" _ dir)
(string-append (which "sh") " " dir (string-append (which "sh") " " dir
"parse-types.sh"))) "parse-types.sh")))
(substitute* "MCONFIG.in"
(("INSTALL_SYMLINK = /bin/sh")
"INSTALL_SYMLINK = sh"))
(substitute* (find-files "." "^Makefile.in$") (substitute* (find-files "." "^Makefile.in$")
(("#!/bin/sh") (("#!/bin/sh")
(string-append "#!" (which "sh")))) (string-append "#!" (which "sh"))))