gnu: automake: Update to 1.13.2.

* gnu/packages/autotools.scm (autoconf-wrapper): Wrap `configure' files
  regardless of the exit code of `autoconf'.  Triggered by Automake's
  `t/am-prog-cc-stdc.sh'.
  (automake): Update to 1.13.2.
This commit is contained in:
Ludovic Courtès 2013-05-17 23:10:47 +02:00
parent 70c4329172
commit f11617d8a6

View file

@ -121,27 +121,27 @@ (define-public autoconf-wrapper
(use-modules (guix build utils)) (use-modules (guix build utils))
(let ((result (apply system* ,autoconf (let ((result (apply system* ,autoconf
(cdr (command-line))))) (cdr (command-line)))))
(if (and (zero? result) (when (and (file-exists? "configure")
(file-exists? "configure") (not (file-exists? "/bin/sh")))
(not (file-exists? "/bin/sh"))) ;; Patch regardless of RESULT, because `autoconf
(begin ;; -Werror' can both create a `configure' file and
(patch-shebang "configure") ;; return a non-zero exit code.
#t) (patch-shebang "configure"))
(exit (status:exit-val result))))) (exit (status:exit-val result))))
port))) port)))
(chmod (string-append bin "/autoconf") #o555))))))) (chmod (string-append bin "/autoconf") #o555)))))))
(define-public automake (define-public automake
(package (package
(name "automake") (name "automake")
(version "1.13.1") (version "1.13.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnu/automake/automake-" (uri (string-append "mirror://gnu/automake/automake-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"12yi1bzkipi7qdmkdy77pazljsa9z7q66hi6c4rq73p7hbv6rkbf")))) "0im691b7bhpg01ka6w46y8kdvagyj9z9dhba27sdx69k6d3j2sc0"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("autoconf" ,autoconf-wrapper) `(("autoconf" ,autoconf-wrapper)