diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2013-05-17 23:10:47 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2013-05-17 23:10:47 +0200 |
| commit | f11617d8a67945ffb1864e78b93da89ea446cb4d (patch) | |
| tree | afc2a2bdcf2ebf45cdd0048bd16c9416f81cdc45 | |
| parent | 70c4329172020bf6cc81170c379ef8d0bd0a9ba0 (diff) | |
| download | guix-patches-f11617d8a67945ffb1864e78b93da89ea446cb4d.tar guix-patches-f11617d8a67945ffb1864e78b93da89ea446cb4d.tar.gz | |
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.
| -rw-r--r-- | gnu/packages/autotools.scm | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/gnu/packages/autotools.scm b/gnu/packages/autotools.scm index 3634338777..6fffa70634 100644 --- a/gnu/packages/autotools.scm +++ b/gnu/packages/autotools.scm @@ -121,27 +121,27 @@ exec ~a --no-auto-compile \"$0\" \"$@\" (use-modules (guix build utils)) (let ((result (apply system* ,autoconf (cdr (command-line))))) - (if (and (zero? result) - (file-exists? "configure") - (not (file-exists? "/bin/sh"))) - (begin - (patch-shebang "configure") - #t) - (exit (status:exit-val result))))) + (when (and (file-exists? "configure") + (not (file-exists? "/bin/sh"))) + ;; Patch regardless of RESULT, because `autoconf + ;; -Werror' can both create a `configure' file and + ;; return a non-zero exit code. + (patch-shebang "configure")) + (exit (status:exit-val result)))) port))) (chmod (string-append bin "/autoconf") #o555))))))) (define-public automake (package (name "automake") - (version "1.13.1") + (version "1.13.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/automake/automake-" version ".tar.xz")) (sha256 (base32 - "12yi1bzkipi7qdmkdy77pazljsa9z7q66hi6c4rq73p7hbv6rkbf")))) + "0im691b7bhpg01ka6w46y8kdvagyj9z9dhba27sdx69k6d3j2sc0")))) (build-system gnu-build-system) (inputs `(("autoconf" ,autoconf-wrapper) |