After I place the libpthread addon in the hurd glibc folder, I need to
rerun autoreconf. But I need exaclty the version 2.68, so I added it.
And because I use the autoconf-wrapper in my glibc/hurd recipe I changed
it to a procedure that takes an 'autoconf-version' argument to decide which
one to use, so I won't have to duplicate things.
From 27f0058e7842416b374d54cdd4f21c1c82433512 Mon Sep 17 00:00:00 2001
From: Manolis Ragkousis <[email protected]>
Date: Mon, 24 Mar 2014 22:18:09 +0000
Subject: [PATCH] gnu: autotools: Added autoconf-2.68 and turned
autoconf-wrapper into a procedure
* gnu/packages/autotools.scm (autoconf-2.68): Added autoconf-2.68 for use
with the Hurd glibc.
* gnu/packages/autotools.scm (autoconf-wrapper): Autoconf-wrapper takes
'autoconf-version' as an argument.
* gnu/packages/autotools.scm (automake): Modify inputs to use the new form.
---
gnu/packages/autotools.scm | 27 +++++++++++++++++++++++----
1 file changed, 23 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/autotools.scm b/gnu/packages/autotools.scm
index c2e4637..35fc3bf 100644
--- a/gnu/packages/autotools.scm
+++ b/gnu/packages/autotools.scm
@@ -27,7 +27,8 @@
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix build-system gnu)
- #:use-module (guix build-system trivial))
+ #:use-module (guix build-system trivial)
+ #:use-module (ice-9 match))
(define-public autoconf
(package
@@ -59,11 +60,27 @@ scripts are self-contained and portable, freeing the user from needing to
know anything about Autoconf or M4.")
(license gpl3+))) ; some files are under GPLv2+
-(define-public autoconf-wrapper
+(define-public autoconf-2.68
+ ;; We need this version for the hurdish glibc
+ (package (inherit autoconf)
+ (version "2.68")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "mirror://gnu/autoconf/autoconf-"
+ version ".tar.xz"))
+ (sha256
+ (base32
+ "1fjm21k2na07f3vasf288a0zx66lbv0hd3l9bvv3q8p62s3pg569"))))))
+
+(define-public (autoconf-wrapper autoconf-version)
;; An Autoconf wrapper 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.
+ ;; The "autoconf-version" is used to determine which version to use,
+ ;; in order to avoid duplication. If you want to use the latest version use
+ ;; ("autoconf" ,(autoconf-wrapper "autoconf")) as an input.
(package (inherit autoconf)
(location (source-properties->location (current-source-location)))
(name (string-append (package-name autoconf) "-wrapper"))
@@ -72,7 +89,9 @@ know anything about Autoconf or M4.")
;; XXX: Kludge to hide the circular dependency.
,(module-ref (resolve-interface '(gnu packages guile))
'guile-2.0))
- ("autoconf" ,autoconf)
+ ("autoconf" ,(match autoconf-version
+ ("autoconf-2.68" autoconf-2.68)
+ ("autoconf" autoconf)))
("bash" ,bash)))
(arguments
'(#:modules ((guix build utils))
@@ -144,7 +163,7 @@ exec ~a --no-auto-compile \"$0\" \"$@\"
(list (search-patch "automake-skip-amhello-tests.patch")))))
(build-system gnu-build-system)
(inputs
- `(("autoconf" ,autoconf-wrapper)
+ `(("autoconf" ,(autoconf-wrapper "autoconf"))
("perl" ,perl)))
(native-search-paths
(list (search-path-specification
--
1.9.0
