gnu: fakeroot: Update to 1.26.

* gnu/packages/linux.scm (fakeroot): Update to 1.26.
[source]: Remove generated man page translations in a new snippet.
[arguments]: Patch Makefile.am instead of Makefile, and do so before
bootstrapping.  Don't explicitly return #t from phases.
[native-inputs]: Use autoconf-2.71.
This commit is contained in:
Tobias Geerinckx-Rice 2021-10-13 23:19:12 +02:00
parent 1961b28445
commit 7b1c73f330
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79

View file

@ -7827,8 +7827,9 @@ (define-public genext2fs
(define-public fakeroot
(package
(name "fakeroot")
(version "1.25.3")
(source (origin
(version "1.26")
(source
(origin
;; There are no tags in the repository, so take this snapshot.
(method url-fetch)
(uri (string-append "https://deb.debian.org/debian/pool/main/f/"
@ -7836,22 +7837,29 @@ (define-public fakeroot
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"0v4m3v1bdqvblwj3vqsb3mllgbci6dsgsydq6765nzvz6n1kd44f"))))
"1sg8inv1zzp4h9ncbbmxip3svd11sd86j22cvxrjwnf5zn7mf2j8"))
(modules '((guix build utils)
(ice-9 ftw)))
(snippet
`(begin
;; Delete pregenerated man page translations, but not the originals.
(with-directory-excursion "doc"
(for-each (lambda (language)
(for-each delete-file
(find-files language "\\.[0-9]$")))
(scandir "."
(lambda (file)
(and (not (string-prefix? "." file))
(eq? 'directory
(stat:type (lstat file))))))))))))
(build-system gnu-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(replace 'bootstrap
(add-after 'unpack 'patch-Makefile.am
(lambda _
;; The "preroll" script takes care of Autoconf and also
;; prepares the translated manuals.
(invoke "sh" "./preroll")))
(add-after 'configure 'patch-Makefile
(lambda _
;; Note: The root of the problem is already in "Makefile.am".
(substitute* "Makefile"
(("/bin/sh") (which "sh")))
#t))
(substitute* "Makefile.am"
(("/bin/sh") (which "sh")))))
(add-after 'unpack 'patch-script
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "scripts/fakeroot.in"
@ -7863,12 +7871,15 @@ (define-public fakeroot
"/bin/sed"))
(("cut")
(string-append (assoc-ref inputs "coreutils")
"/bin/cut")) )
#t))
"/bin/cut")) )))
(replace 'bootstrap
(lambda _
;; The "preroll" script takes care of Autoconf and also
;; prepares the translated manuals.
(invoke "sh" "./preroll")))
(add-before 'configure 'setenv
(lambda _
(setenv "LIBS" "-lacl")
#t))
(setenv "LIBS" "-lacl")))
(add-before 'check 'prepare-check
(lambda _
(setenv "SHELL" (which "bash"))
@ -7884,11 +7895,10 @@ (define-public fakeroot
(("daemon:") "1:"))
;; We don't have an /etc/passwd entry for "root" - use numeric IDs.
(substitute* "test/compare-tar"
(("tar -tvf") "tar --numeric-owner -tvf"))
#t)))))
(("tar -tvf") "tar --numeric-owner -tvf")))))))
(native-inputs
`(;; For bootstrapping the package.
("autoconf" ,autoconf)
("autoconf" ,autoconf-2.71)
("automake" ,automake)
("libtool" ,libtool)
("gettext" ,gettext-minimal)