diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2017-12-31 00:35:06 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2017-12-31 01:20:30 +0100 |
| commit | c99a64e15f19228ce03a683cae6e5b12d6bc1be3 (patch) | |
| tree | 0ca8a3fad04ae8413ab4f6c840aa359cd8977265 /gnu/packages/make-bootstrap.scm | |
| parent | 150e230165901fb7e35f0e1d69bae0344f0ffe53 (diff) | |
| download | guix-patches-c99a64e15f19228ce03a683cae6e5b12d6bc1be3.tar guix-patches-c99a64e15f19228ce03a683cae6e5b12d6bc1be3.tar.gz | |
gnu: guile-static: Reuse the existing phases.
This is a followup to 33c3a214a4194a34b534bccf76bdd05db8ee565b.
* gnu/packages/make-bootstrap.scm (%guile-static)[arguments]: Use
'substitute-keyword-arguments'. Honor the existing phases.
Diffstat (limited to 'gnu/packages/make-bootstrap.scm')
| -rw-r--r-- | gnu/packages/make-bootstrap.scm | 49 |
1 files changed, 25 insertions, 24 deletions
diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index 492ccb8114..4b81f73f2e 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -520,30 +520,31 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." ,@(alist-delete "bdw-gc" (package-propagated-inputs guile-2.2)))) (arguments - `(;; When `configure' checks for ltdl availability, it - ;; doesn't try to link using libtool, and thus fails - ;; because of a missing -ldl. Work around that. - #:configure-flags '("LDFLAGS=-ldl") - - #:phases (alist-cons-before - 'configure 'static-guile - (lambda _ - (substitute* "libguile/Makefile.in" - ;; Create a statically-linked `guile' - ;; executable. - (("^guile_LDFLAGS =") - "guile_LDFLAGS = -all-static") - - ;; Add `-ldl' *after* libguile-2.2.la. - (("^guile_LDADD =(.*)$" _ ldadd) - (string-append "guile_LDADD = " - (string-trim-right ldadd) - " -ldl\n")))) - %standard-phases) - - ;; There are uses of `dynamic-link' in - ;; {foreign,coverage}.test that don't fly here. - #:tests? #f))))) + (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 + ;; because of a missing -ldl. Work around that. + ''("LDFLAGS=-ldl")) + ((#:phases phases '%standard-phases) + `(modify-phases ,phases + (add-before 'configure 'static-guile + (lambda _ + (substitute* "libguile/Makefile.in" + ;; Create a statically-linked `guile' + ;; executable. + (("^guile_LDFLAGS =") + "guile_LDFLAGS = -all-static") + + ;; Add `-ldl' *after* libguile-2.2.la. + (("^guile_LDADD =(.*)$" _ ldadd) + (string-append "guile_LDADD = " + (string-trim-right ldadd) + " -ldl\n"))))))) + ((#:tests? _ #f) + ;; There are uses of `dynamic-link' in + ;; {foreign,coverage}.test that don't fly here. + #f)))))) (package-with-relocatable-glibc (static-package guile)))) (define %guile-static-stripped |