diff options
author | Marius Bakke <mbakke@fastmail.com> | 2017-05-10 15:48:38 +0200 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2017-05-10 16:44:01 +0200 |
commit | b047a86b6ce9f953034df1198ad73dcd223aaa3f (patch) | |
tree | 267f2132f98d62416a2177bde1499728ec2347f6 /gnu/packages/linux.scm | |
parent | 55acb372e38051399de52589407ca8cf7d04398d (diff) | |
download | guix-patches-b047a86b6ce9f953034df1198ad73dcd223aaa3f.tar guix-patches-b047a86b6ce9f953034df1198ad73dcd223aaa3f.tar.gz |
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.
Diffstat (limited to 'gnu/packages/linux.scm')
-rw-r--r-- | gnu/packages/linux.scm | 48 |
1 files changed, 18 insertions, 30 deletions
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 0495f045f4..eb7c5d14ae 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -646,7 +646,7 @@ slabtop, and skill.") (define-public e2fsprogs (package (name "e2fsprogs") - (version "1.42.13") + (version "1.43.4") (source (origin (method url-fetch) (uri (string-append @@ -655,45 +655,30 @@ slabtop, and skill.") name "-" version ".tar.xz")) (sha256 (base32 - "1ix0b83zgw5n0p2grh2961c6796m92yr2jqc2sbr23x3lfsp8r71")) - (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")))))) + "092absr4vrlqrkdf9nwh4ykj40ab6hhwrkdr6sjsccd54c8z5csl")))) (build-system gnu-build-system) (inputs `(("util-linux" ,util-linux))) (native-inputs `(("pkg-config" ,pkg-config) ("texinfo" ,texinfo))) ;for the libext2fs Info manual (arguments - '(;; Parallel building reliably yields a failure like this: - ;; "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 + '(;; util-linux is the preferred source for some of the libraries and ;; commands, so disable them (see, e.g., ;; <http://git.buildroot.net/buildroot/commit/?id=e1ffc2f791b33633>.) - #:configure-flags '("--disable-libblkid" - "--disable-libuuid" "--disable-uuidd" - "--disable-fsck" + #:configure-flags (list "--disable-libblkid" + "--disable-libuuid" "--disable-uuidd" + "--disable-fsck" - ;; Use symlinks instead of hard links for - ;; 'fsck.extN' etc. This makes the resulting nar - ;; smaller and is preserved across copies. - "--enable-symlink-install" + ;; Use symlinks instead of hard links for + ;; 'fsck.extN' etc. This makes the resulting nar + ;; smaller and is preserved across copies. + "--enable-symlink-install" - ;; Install libext2fs et al. - "--enable-elf-shlibs") + (string-append "LDFLAGS=-Wl,-rpath=" + (assoc-ref %outputs "out") + "/lib") - #:make-flags (list (string-append "LDFLAGS=-Wl,-rpath=" - (assoc-ref %outputs "out") - "/lib")) + ;; Install libext2fs et al. + "--enable-elf-shlibs") #:phases (modify-phases %standard-phases @@ -703,6 +688,9 @@ slabtop, and skill.") (("/bin/sh (.*)parse-types.sh" _ dir) (string-append (which "sh") " " dir "parse-types.sh"))) + (substitute* "MCONFIG.in" + (("INSTALL_SYMLINK = /bin/sh") + "INSTALL_SYMLINK = sh")) (substitute* (find-files "." "^Makefile.in$") (("#!/bin/sh") (string-append "#!" (which "sh")))) |