me/guix
Archived
1
0
Fork 0
Code Activity

gnu: hurd: Move configure flags from "hurd-minimal" to "hurd-headers".

Browse source 
* gnu/packages/hurd.scm (hurd-minimal)[arguments]: Move configure-flags from here..
  (hurd-headers)[arguments]: ..to here.
This commit is contained in:
Manolis Ragkousis 2016-06-07 22:16:19 +03:00
parent 90b5d00bcb
commit e1ecd50e21
No known key found for this signature in database
GPG key ID: 327C1EF38DF54C32
1 changed files with 29 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
gnu/packages/hurd.scm
View file

@ -21,6 +21,7 @@
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (guix utils)
#: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 (gnu packages flex) #:use-module (gnu packages flex)
@ -126,7 +127,14 @@ communication.")
'("--host=i586-pc-gnu")) '("--host=i586-pc-gnu"))
;; Reduce set of dependencies. ;; 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)) #:tests? #f))
(home-page "http://www.gnu.org/software/hurd/hurd.html") (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))) (inputs `(("glibc-hurd-headers" ,glibc/hurd-headers)))
(native-inputs (native-inputs
`(("mig" ,mig))) `(("mig" ,mig)))
(arguments (arguments
`(#:phases (alist-replace (substitute-keyword-arguments (package-arguments hurd-headers)
'install ((#:phases _)
(lambda* (#:key outputs #:allow-other-keys) '(alist-replace
(let ((out (assoc-ref outputs "out"))) 'install
;; We need to copy libihash.a to the output directory manually, (lambda* (#:key outputs #:allow-other-keys)
;; since there is no target for that in the makefile. (let ((out (assoc-ref outputs "out")))
(mkdir-p (string-append out "/include")) ;; We need to copy libihash.a to the output directory manually,
(copy-file "libihash/ihash.h" ;; since there is no target for that in the makefile.
(string-append out "/include/ihash.h")) (mkdir-p (string-append out "/include"))
(mkdir-p (string-append out "/lib")) (copy-file "libihash/ihash.h"
(copy-file "libihash/libihash.a" (string-append out "/include/ihash.h"))
(string-append out "/lib/libihash.a")) (mkdir-p (string-append out "/lib"))
#t)) (copy-file "libihash/libihash.a"
(alist-replace (string-append out "/lib/libihash.a"))
'build #t))
(lambda _ (alist-replace
(zero? (system* "make" "-Clibihash" "libihash.a"))) 'build
(alist-cons-before (lambda _
'configure 'bootstrap (zero? (system* "make" "-Clibihash" "libihash.a")))
(lambda _ %standard-phases)))))
(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))
(home-page "http://www.gnu.org/software/hurd/hurd.html") (home-page "http://www.gnu.org/software/hurd/hurd.html")
(synopsis "GNU Hurd libraries") (synopsis "GNU Hurd libraries")
(description (description