summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2013-05-17 23:10:47 +0200
committerLudovic Courtès <ludo@gnu.org>2013-05-17 23:10:47 +0200
commitf11617d8a67945ffb1864e78b93da89ea446cb4d (patch)
treeafc2a2bdcf2ebf45cdd0048bd16c9416f81cdc45
parent70c4329172020bf6cc81170c379ef8d0bd0a9ba0 (diff)
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.scm18
1 files changed, 9 insertions, 9 deletions
diff --git a/gnu/packages/autotools.scm b/gnu/packages/autotools.scm
index 3634338777f..6fffa706341 100644
--- a/gnu/packages/autotools.scm
+++ b/gnu/packages/autotools.scm
@@ -121,27 +121,27 @@ exec ~a --no-auto-compile \"$0\" \"$@\"
121 (use-modules (guix build utils)) 121 (use-modules (guix build utils))
122 (let ((result (apply system* ,autoconf 122 (let ((result (apply system* ,autoconf
123 (cdr (command-line))))) 123 (cdr (command-line)))))
124 (if (and (zero? result) 124 (when (and (file-exists? "configure")
125 (file-exists? "configure") 125 (not (file-exists? "/bin/sh")))
126 (not (file-exists? "/bin/sh"))) 126 ;; Patch regardless of RESULT, because `autoconf
127 (begin 127 ;; -Werror' can both create a `configure' file and
128 (patch-shebang "configure") 128 ;; return a non-zero exit code.
129 #t) 129 (patch-shebang "configure"))
130 (exit (status:exit-val result))))) 130 (exit (status:exit-val result))))
131 port))) 131 port)))
132 (chmod (string-append bin "/autoconf") #o555))))))) 132 (chmod (string-append bin "/autoconf") #o555)))))))
133 133
134(define-public automake 134(define-public automake
135 (package 135 (package
136 (name "automake") 136 (name "automake")
137 (version "1.13.1") 137 (version "1.13.2")
138 (source (origin 138 (source (origin
139 (method url-fetch) 139 (method url-fetch)
140 (uri (string-append "mirror://gnu/automake/automake-" 140 (uri (string-append "mirror://gnu/automake/automake-"
141 version ".tar.xz")) 141 version ".tar.xz"))
142 (sha256 142 (sha256
143 (base32 143 (base32
144 "12yi1bzkipi7qdmkdy77pazljsa9z7q66hi6c4rq73p7hbv6rkbf")))) 144 "0im691b7bhpg01ka6w46y8kdvagyj9z9dhba27sdx69k6d3j2sc0"))))
145 (build-system gnu-build-system) 145 (build-system gnu-build-system)
146 (inputs 146 (inputs
147 `(("autoconf" ,autoconf-wrapper) 147 `(("autoconf" ,autoconf-wrapper)