[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
17/21: gnu: guile-static: Switch to gexps.
From: |
guix-commits |
Subject: |
17/21: gnu: guile-static: Switch to gexps. |
Date: |
Thu, 30 Mar 2023 06:47:02 -0400 (EDT) |
civodul pushed a commit to branch core-updates
in repository guix.
commit ca7b1e2fd71fe123e396179a2d3efbfb6eb2cc73
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Mon Mar 27 12:29:39 2023 +0200
gnu: guile-static: Switch to gexps.
* gnu/packages/make-bootstrap.scm (make-guile-static): Switch to gexps.
---
gnu/packages/make-bootstrap.scm | 68 ++++++++++++++++++++---------------------
1 file changed, 34 insertions(+), 34 deletions(-)
diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm
index 2eed01ece8..6bafc5697c 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."
(replace "libgc" libgc/static-libs)))
(arguments
(substitute-keyword-arguments (package-arguments guile)
- ((#:configure-flags flags '())
+ ((#: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.
- `(list "LDFLAGS=-ldl" "--enable-mini-gmp"
-
- ;; Guile does an LTO build by default, but in 3.0.9 it
- ;; wrongfully picks 'ar' instead of 'gcc-ar', so work around
- ;; it (see <https://issues.guix.gnu.org/61086>).
- ,@(if (version-prefix? "3.0" (package-version guile))
- '("AR=gcc-ar" "RANLIB=gcc-ranlib")
- '())
-
- ,@(if (hurd-target?)
- '("--disable-jit")
- '())))
+ #~(list "LDFLAGS=-ldl" "--enable-mini-gmp"
+
+ ;; Guile does an LTO build by default, but in 3.0.9 it
+ ;; wrongfully picks 'ar' instead of 'gcc-ar', so work around
+ ;; it (see <https://issues.guix.gnu.org/61086>).
+ #$@(if (version-prefix? "3.0" (package-version guile))
+ #~("AR=gcc-ar" "RANLIB=gcc-ranlib")
+ #~())
+
+ #$@(if (hurd-target?)
+ #~("--disable-jit")
+ #~())))
((#:phases phases '%standard-phases)
- `(modify-phases ,phases
-
- ;; Do not record the absolute file name of 'sh' in
- ;; (ice-9 popen). This makes 'open-pipe' unusable in
- ;; a build chroot ('open-pipe*' is fine) but avoids
- ;; keeping a reference to Bash.
- (delete 'pre-configure)
-
- (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.0.la.
- (("^guile_LDADD =(.*)$" _ ldadd)
- (string-append "guile_LDADD = "
- (string-trim-right ldadd)
- " -ldl\n")))))))
+ #~(modify-phases #$phases
+
+ ;; Do not record the absolute file name of 'sh' in
+ ;; (ice-9 popen). This makes 'open-pipe' unusable in
+ ;; a build chroot ('open-pipe*' is fine) but avoids
+ ;; keeping a reference to Bash.
+ (delete 'pre-configure)
+
+ (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.0.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.
- 10/21: gnu: hurd: Remove useless glibc/hurd-headers input., (continued)
- 10/21: gnu: hurd: Remove useless glibc/hurd-headers input., guix-commits, 2023/03/30
- 11/21: gnu: gnumach, hurd-headers, hurd: Switch to using cross-mig., guix-commits, 2023/03/30
- 13/21: gnu: mig/32-bit: Remove., guix-commits, 2023/03/30
- 09/21: gnu: hurd: Update to 3ff7053., guix-commits, 2023/03/30
- 16/21: gnu: linux-pam: Allow compilation on GNU/Hurd., guix-commits, 2023/03/30
- 18/21: gnu: guile: Switch to gexps., guix-commits, 2023/03/30
- 04/21: gnu: cross-base: Factor out cross-mig., guix-commits, 2023/03/30
- 14/21: system: hurd: Use shepherd-0.8 in the package list., guix-commits, 2023/03/30
- 15/21: gnu: linux-pam: Switch to gexps., guix-commits, 2023/03/30
- 12/21: gnu: hurd: Update DDE and use libdde_linux26., guix-commits, 2023/03/30
- 17/21: gnu: guile-static: Switch to gexps.,
guix-commits <=
- 21/21: maint: Re-add IceCat to '%system-packages'., guix-commits, 2023/03/30
- 05/21: gnu: cross-base: Add cross arguments to hurd derivatives., guix-commits, 2023/03/30
- 03/21: gnu: gcc@11: Patch libpthread on GNU/Hurd., guix-commits, 2023/03/30
- 07/21: gnu: mig: Update to 1.8+git20220827., guix-commits, 2023/03/30
- 19/21: gnu: guile-readline: Switch to gexps., guix-commits, 2023/03/30
- 20/21: gnu: guile: Fix 'posix_spawn' usage for GNU/Hurd., guix-commits, 2023/03/30