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

gnu: commencement: Remove unneeded configure flag for bootstrap gettext. 

* gnu/packages/commencement.scm (gettext-boot0): Remove unneeded
  --disable-threads.
This commit is contained in:
Ludovic Courtès 2015-04-22 00:31:22 +02:00
parent cc8ddcb097
commit 669b8639a2
1 changed files with 24 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
gnu/packages/commencement.scm
View File

@ -421,34 +421,32 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
(define gettext-boot0
;; A minimal gettext used during bootstrap.
(let ((gettext-minimal (package
(inherit gnu-gettext)
(name "gettext-boot0")
(inputs '()) ;zero dependencies
(arguments
(substitute-keyword-arguments
`(#:configure-flags '("--disable-threads")
#:tests? #f
,@(package-arguments gnu-gettext))
((#:phases phases)
`(modify-phases ,phases
;; Build only the tools.
(add-after 'unpack 'chdir
(lambda _
(chdir "gettext-tools")))
(let ((gettext-minimal
(package (inherit gnu-gettext)
(name "gettext-boot0")
(inputs '()) ;zero dependencies
(arguments
(substitute-keyword-arguments
`(#:tests? #f
,@(package-arguments gnu-gettext))
((#:phases phases)
`(modify-phases ,phases
;; Build only the tools.
(add-after 'unpack 'chdir
(lambda _
(chdir "gettext-tools")))
;; Some test programs require pthreads,
;; which we don't have.
(add-before 'configure 'no-test-programs
(lambda _
(substitute* "tests/Makefile.in"
(("^PROGRAMS =.*$")
"PROGRAMS =\n"))
#t))
;; Some test programs require pthreads, which we don't have.
(add-before 'configure 'no-test-programs
(lambda _
(substitute* "tests/Makefile.in"
(("^PROGRAMS =.*$")
"PROGRAMS =\n"))
#t))
;; Don't try to link against libexpat.
(delete 'link-expat)
(delete 'patch-tests))))))))
;; Don't try to link against libexpat.
(delete 'link-expat)
(delete 'patch-tests))))))))
(package-with-bootstrap-guile
(package-with-explicit-inputs gettext-minimal
%boot1-inputs