nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: automake: Update to 1.16. 

* gnu/packages/autotools.scm (automake): Update to 1.16.
[arguments]: Fix indentation and end all phases with #t.
This commit is contained in:
Tobias Geerinckx-Rice 2018-02-26 18:59:30 +01:00
parent e2e3c55252
commit cc35533304
No known key found for this signature in database
GPG Key ID: 0DB0FF884F556D79
1 changed files with 29 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
gnu/packages/autotools.scm
View File

@ -7,6 +7,7 @@
;;; Copyright © 2016 David Thompson <davet@gnu.org> ;;; Copyright © 2016 David Thompson <davet@gnu.org>
;;; Copyright © 2017 ng0 <ng0@infotropique.org> ;;; Copyright © 2017 ng0 <ng0@infotropique.org>
;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -241,14 +242,14 @@ output is indexed in many ways to simplify browsing.")
(define-public automake (define-public automake
(package (package
(name "automake") (name "automake")
(version "1.15.1") (version "1.16")
(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
"1bzd9g32dfm4rsbw93ld9x7b5nc1y6i4m6zp032qf1i28a8s6sxg")) "12jvcmkcmd5p14b41w9f7ixd3sca97pymd6lqbkwnl8qn6bjv3zr"))
(patches (patches
(search-patches "automake-skip-amhello-tests.patch")))) (search-patches "automake-skip-amhello-tests.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
@ -280,32 +281,33 @@ output is indexed in many ways to simplify browsing.")
(setenv "CONFIG_SHELL" sh) (setenv "CONFIG_SHELL" sh)
#t))) #t)))
;; Files like `install-sh', `mdate.sh', etc. must use ;; Files like `install-sh', `mdate.sh', etc. must use
;; #!/bin/sh, otherwise users could leak erroneous shebangs ;; #!/bin/sh, otherwise users could leak erroneous shebangs
;; in the wild. See <http://bugs.gnu.org/14201> for an ;; in the wild. See <http://bugs.gnu.org/14201> for an
;; example. ;; example.
(add-after 'install 'unpatch-shebangs (add-after 'install 'unpatch-shebangs
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(dir (string-append out "/share"))) (dir (string-append out "/share")))
(define (starts-with-shebang? file) (define (starts-with-shebang? file)
(equal? (call-with-input-file file (equal? (call-with-input-file file
(lambda (p) (lambda (p)
(list (get-u8 p) (get-u8 p)))) (list (get-u8 p) (get-u8 p))))
(map char->integer '(#\# #\!)))) (map char->integer '(#\# #\!))))
(for-each (lambda (file) (for-each (lambda (file)
(when (and (starts-with-shebang? file) (when (and (starts-with-shebang? file)
(executable-file? file)) (executable-file? file))
(format #t "restoring shebang on `~a'~%" (format #t "restoring shebang on `~a'~%"
file) file)
(substitute* file (substitute* file
(("^#!.*/bin/sh") (("^#!.*/bin/sh")
"#!/bin/sh") "#!/bin/sh")
(("^#!.*/bin/env(.*)$" _ args) (("^#!.*/bin/env(.*)$" _ args)
(string-append "#!/usr/bin/env" (string-append "#!/usr/bin/env"
args))))) args)))))
(find-files dir ".*")))))))) (find-files dir ".*"))
#t))))))
(home-page "https://www.gnu.org/software/automake/") (home-page "https://www.gnu.org/software/automake/")
(synopsis "Making GNU standards-compliant Makefiles") (synopsis "Making GNU standards-compliant Makefiles")
(description (description