aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorManolis Ragkousis <manolis837@gmail.com>2016-06-07 22:16:19 +0300
committerManolis Ragkousis <manolis837@gmail.com>2016-06-07 22:28:24 +0300
commite1ecd50e217ea97bc1183d596a42d8c4f2de34a7 (patch)
treea5ae267f42f0396e4909f7ab88203f01ac7dac84
parent90b5d00bcb889d274cd9feeaed70725e4120d53f (diff)
downloadguix-e1ecd50e217ea97bc1183d596a42d8c4f2de34a7.tar
guix-e1ecd50e217ea97bc1183d596a42d8c4f2de34a7.tar.gz
gnu: hurd: Move configure flags from "hurd-minimal" to "hurd-headers".
* gnu/packages/hurd.scm (hurd-minimal)[arguments]: Move configure-flags from here.. (hurd-headers)[arguments]: ..to here.
-rw-r--r--gnu/packages/hurd.scm67
1 files changed, 29 insertions, 38 deletions
diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm
index 9eef110901..a4c0296b04 100644
--- a/gnu/packages/hurd.scm
+++ b/gnu/packages/hurd.scm
@@ -21,6 +21,7 @@
#:use-module (guix download)
#:use-module (guix packages)
#:use-module (gnu packages)
+ #:use-module (guix utils)
#:use-module (guix build-system gnu)
#:use-module (guix build-system trivial)
#:use-module (gnu packages flex)
@@ -126,7 +127,14 @@ communication.")
'("--host=i586-pc-gnu"))
;; Reduce set of dependencies.
- "--without-parted")
+ "--without-parted"
+ "--disable-ncursesw"
+ "--disable-test"
+ "--without-libbz2"
+ "--without-libz"
+ ;; Skip the clnt_create check because it expects
+ ;; a working glibc causing a circular dependency.
+ "ac_cv_search_clnt_create=no")
#:tests? #f))
(home-page "http://www.gnu.org/software/hurd/hurd.html")
@@ -142,44 +150,27 @@ Library and other user programs.")
(inputs `(("glibc-hurd-headers" ,glibc/hurd-headers)))
(native-inputs
`(("mig" ,mig)))
-
(arguments
- `(#:phases (alist-replace
- 'install
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out")))
- ;; We need to copy libihash.a to the output directory manually,
- ;; since there is no target for that in the makefile.
- (mkdir-p (string-append out "/include"))
- (copy-file "libihash/ihash.h"
- (string-append out "/include/ihash.h"))
- (mkdir-p (string-append out "/lib"))
- (copy-file "libihash/libihash.a"
- (string-append out "/lib/libihash.a"))
- #t))
- (alist-replace
- 'build
- (lambda _
- (zero? (system* "make" "-Clibihash" "libihash.a")))
- (alist-cons-before
- 'configure 'bootstrap
- (lambda _
- (zero? (system* "autoreconf" "-vfi")))
- %standard-phases)))
- #:configure-flags '(;; Pretend we're on GNU/Hurd; 'configure' wants
- ;; that.
- "--host=i686-pc-gnu"
-
- ;; Reduce set of dependencies.
- "--disable-ncursesw"
- "--disable-test"
- "--without-libbz2"
- "--without-libz"
- "--without-parted"
- ;; Skip the clnt_create check because it expects
- ;; a working glibc causing a circular dependency.
- "ac_cv_search_clnt_create=no")
- #:tests? #f))
+ (substitute-keyword-arguments (package-arguments hurd-headers)
+ ((#:phases _)
+ '(alist-replace
+ 'install
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out")))
+ ;; We need to copy libihash.a to the output directory manually,
+ ;; since there is no target for that in the makefile.
+ (mkdir-p (string-append out "/include"))
+ (copy-file "libihash/ihash.h"
+ (string-append out "/include/ihash.h"))
+ (mkdir-p (string-append out "/lib"))
+ (copy-file "libihash/libihash.a"
+ (string-append out "/lib/libihash.a"))
+ #t))
+ (alist-replace
+ 'build
+ (lambda _
+ (zero? (system* "make" "-Clibihash" "libihash.a")))
+ %standard-phases)))))
(home-page "http://www.gnu.org/software/hurd/hurd.html")
(synopsis "GNU Hurd libraries")
(description