ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-26 22:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: guile-static: Reuse the existing phases.

Browse source 
This is a followup to 33c3a214a4.

* gnu/packages/make-bootstrap.scm (%guile-static)[arguments]: Use
'substitute-keyword-arguments'.  Honor the existing phases.
This commit is contained in:
Ludovic Courtès 2017-12-31 00:35:06 +01:00
parent 150e230165
commit c99a64e15f
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 24 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
gnu/packages/make-bootstrap.scm
View file

@ -520,13 +520,15 @@ (define %guile-static
,@(alist-delete "bdw-gc" ,@(alist-delete "bdw-gc"
(package-propagated-inputs guile-2.2)))) (package-propagated-inputs guile-2.2))))
(arguments (arguments
`(;; When `configure' checks for ltdl availability, it (substitute-keyword-arguments (package-arguments guile-2.2)
((#:configure-flags flags '())
;; When `configure' checks for ltdl availability, it
;; doesn't try to link using libtool, and thus fails ;; doesn't try to link using libtool, and thus fails
;; because of a missing -ldl. Work around that. ;; because of a missing -ldl. Work around that.
#:configure-flags '("LDFLAGS=-ldl") ''("LDFLAGS=-ldl"))
((#:phases phases '%standard-phases)
#:phases (alist-cons-before `(modify-phases ,phases
'configure 'static-guile (add-before 'configure 'static-guile
(lambda _ (lambda _
(substitute* "libguile/Makefile.in" (substitute* "libguile/Makefile.in"
;; Create a statically-linked `guile' ;; Create a statically-linked `guile'
@ -538,12 +540,11 @@ (define %guile-static
(("^guile_LDADD =(.*)$" _ ldadd) (("^guile_LDADD =(.*)$" _ ldadd)
(string-append "guile_LDADD = " (string-append "guile_LDADD = "
(string-trim-right ldadd) (string-trim-right ldadd)
" -ldl\n")))) " -ldl\n")))))))
%standard-phases) ((#:tests? _ #f)
;; There are uses of `dynamic-link' in ;; There are uses of `dynamic-link' in
;; {foreign,coverage}.test that don't fly here. ;; {foreign,coverage}.test that don't fly here.
#:tests? #f))))) #f))))))
(package-with-relocatable-glibc (static-package guile)))) (package-with-relocatable-glibc (static-package guile))))
(define %guile-static-stripped (define %guile-static-stripped