summaryrefslogtreecommitdiff
path: root/gnu/packages/make-bootstrap.scm
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2023-03-27 12:29:39 +0200
committerLudovic Courtès <ludo@gnu.org>2023-03-30 12:44:21 +0200
commitca7b1e2fd71fe123e396179a2d3efbfb6eb2cc73 (patch)
tree5e1dc59d5ef9d24f5c3172e329ccc97bc7057d3f /gnu/packages/make-bootstrap.scm
parent83125dbc94aa1bb110d170d46ed70b8fdbd5f15e (diff)
gnu: guile-static: Switch to gexps.
* gnu/packages/make-bootstrap.scm (make-guile-static): Switch to gexps.
Diffstat (limited to 'gnu/packages/make-bootstrap.scm')
-rw-r--r--gnu/packages/make-bootstrap.scm68
1 files changed, 34 insertions, 34 deletions
diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm
index 2eed01ece88..6bafc5697c8 100644
--- a/gnu/packages/make-bootstrap.scm
+++ b/gnu/packages/make-bootstrap.scm
@@ -613,44 +613,44 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
613 (replace "libgc" libgc/static-libs))) 613 (replace "libgc" libgc/static-libs)))
614 (arguments 614 (arguments
615 (substitute-keyword-arguments (package-arguments guile) 615 (substitute-keyword-arguments (package-arguments guile)
616 ((#:configure-flags flags '()) 616 ((#:configure-flags flags #~'())
617 ;; When `configure' checks for ltdl availability, it 617 ;; When `configure' checks for ltdl availability, it
618 ;; doesn't try to link using libtool, and thus fails 618 ;; doesn't try to link using libtool, and thus fails
619 ;; because of a missing -ldl. Work around that. 619 ;; because of a missing -ldl. Work around that.
620 `(list "LDFLAGS=-ldl" "--enable-mini-gmp" 620 #~(list "LDFLAGS=-ldl" "--enable-mini-gmp"
621 621
622 ;; Guile does an LTO build by default, but in 3.0.9 it 622 ;; Guile does an LTO build by default, but in 3.0.9 it
623 ;; wrongfully picks 'ar' instead of 'gcc-ar', so work around 623 ;; wrongfully picks 'ar' instead of 'gcc-ar', so work around
624 ;; it (see <https://issues.guix.gnu.org/61086>). 624 ;; it (see <https://issues.guix.gnu.org/61086>).
625 ,@(if (version-prefix? "3.0" (package-version guile)) 625 #$@(if (version-prefix? "3.0" (package-version guile))
626 '("AR=gcc-ar" "RANLIB=gcc-ranlib") 626 #~("AR=gcc-ar" "RANLIB=gcc-ranlib")
627 '()) 627 #~())
628 628
629 ,@(if (hurd-target?) 629 #$@(if (hurd-target?)
630 '("--disable-jit") 630 #~("--disable-jit")
631 '()))) 631 #~())))
632 ((#:phases phases '%standard-phases) 632 ((#:phases phases '%standard-phases)
633 `(modify-phases ,phases 633 #~(modify-phases #$phases
634 634
635 ;; Do not record the absolute file name of 'sh' in 635 ;; Do not record the absolute file name of 'sh' in
636 ;; (ice-9 popen). This makes 'open-pipe' unusable in 636 ;; (ice-9 popen). This makes 'open-pipe' unusable in
637 ;; a build chroot ('open-pipe*' is fine) but avoids 637 ;; a build chroot ('open-pipe*' is fine) but avoids
638 ;; keeping a reference to Bash. 638 ;; keeping a reference to Bash.
639 (delete 'pre-configure) 639 (delete 'pre-configure)
640 640
641 (add-before 'configure 'static-guile 641 (add-before 'configure 'static-guile
642 (lambda _ 642 (lambda _
643 (substitute* "libguile/Makefile.in" 643 (substitute* "libguile/Makefile.in"
644 ;; Create a statically-linked `guile' 644 ;; Create a statically-linked `guile'
645 ;; executable. 645 ;; executable.
646 (("^guile_LDFLAGS =") 646 (("^guile_LDFLAGS =")
647 "guile_LDFLAGS = -all-static") 647 "guile_LDFLAGS = -all-static")
648 648
649 ;; Add `-ldl' *after* libguile-2.0.la. 649 ;; Add `-ldl' *after* libguile-2.0.la.
650 (("^guile_LDADD =(.*)$" _ ldadd) 650 (("^guile_LDADD =(.*)$" _ ldadd)
651 (string-append "guile_LDADD = " 651 (string-append "guile_LDADD = "
652 (string-trim-right ldadd) 652 (string-trim-right ldadd)
653 " -ldl\n"))))))) 653 " -ldl\n")))))))
654 ((#:tests? _ #f) 654 ((#:tests? _ #f)
655 ;; There are uses of `dynamic-link' in 655 ;; There are uses of `dynamic-link' in
656 ;; {foreign,coverage}.test that don't fly here. 656 ;; {foreign,coverage}.test that don't fly here.