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

gnu: autotools: Add Autoconf 2.68; turn 'autoconf-wrapper' into a procedure. 

* gnu/packages/autotools.scm (autoconf-2.68): New variable.
  (autoconf-wrapper): Turn into a procedure.  Turn comment into a
  docstring.
  (automake): Adjust accordingly.

Co-authored-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Manolis Ragkousis 2014-03-24 22:18:09 +00:00 committed by Ludovic Courtès
parent 8b7af63754
commit c6e9628078
1 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
gnu/packages/autotools.scm
View File

@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012 Nikita Karetnikov <nikita@karetnikov.org> ;;; Copyright © 2012 Nikita Karetnikov <nikita@karetnikov.org>
;;; Copyright © 2012, 2013 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2012, 2013, 2014 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -27,7 +28,9 @@
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system trivial)) #:use-module (guix build-system trivial)
#:use-module (ice-9 match)
#:export (autoconf-wrapper))
(define-public autoconf (define-public autoconf
(package (package
@ -59,11 +62,23 @@ scripts are self-contained and portable, freeing the user from needing to
know anything about Autoconf or M4.") know anything about Autoconf or M4.")
(license gpl3+))) ; some files are under GPLv2+ (license gpl3+))) ; some files are under GPLv2+
(define-public autoconf-wrapper (define-public autoconf-2.68
;; An Autoconf wrapper that generates `configure' scripts that use our (package (inherit autoconf)
;; own Bash instead of /bin/sh in shebangs. For that reason, it (version "2.68")
;; should only be used internally---users should not end up (source
;; distributing `configure' files with a system-specific shebang. (origin
(method url-fetch)
(uri (string-append "mirror://gnu/autoconf/autoconf-"
version ".tar.xz"))
(sha256
(base32
"1fjm21k2na07f3vasf288a0zx66lbv0hd3l9bvv3q8p62s3pg569"))))))
(define* (autoconf-wrapper #:optional (autoconf autoconf))
"Return an wrapper around AUTOCONF that generates `configure' scripts that
use our own Bash instead of /bin/sh in shebangs. For that reason, it should
only be used internally---users should not end up distributing `configure'
files with a system-specific shebang."
(package (inherit autoconf) (package (inherit autoconf)
(location (source-properties->location (current-source-location))) (location (source-properties->location (current-source-location)))
(name (string-append (package-name autoconf) "-wrapper")) (name (string-append (package-name autoconf) "-wrapper"))
@ -144,7 +159,7 @@ exec ~a --no-auto-compile \"$0\" \"$@\"
(list (search-patch "automake-skip-amhello-tests.patch"))))) (list (search-patch "automake-skip-amhello-tests.patch")))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("autoconf" ,autoconf-wrapper) `(("autoconf" ,(autoconf-wrapper))
("perl" ,perl))) ("perl" ,perl)))
(native-search-paths (native-search-paths
(list (search-path-specification (list (search-path-specification