diff mbox series

[bug#62307,core-updates,v2,17/20] gnu: guile-static: Switch to gexps.

Message ID 20230328142852.26635-18-ludo@gnu.org
State New
Headers show
Series Update Hurd and fix build failures | expand

Commit Message

Ludovic Court├Ęs March 28, 2023, 2:28 p.m. UTC
* gnu/packages/make-bootstrap.scm (make-guile-static): Switch to gexps.
---
 gnu/packages/make-bootstrap.scm | 58 ++++++++++++++++-----------------
 1 file changed, 29 insertions(+), 29 deletions(-)
diff mbox series

Patch

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 @@  (define* (make-guile-static guile patches)
          (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"
+          #~(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")
-                       '())
+                  ;; 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")
-                       '())))
+                  #$@(if (hurd-target?)
+                         #~("--disable-jit")
+                         #~())))
          ((#:phases phases '%standard-phases)
-          `(modify-phases ,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)
+              ;; 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-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")))))))
+                    ;; 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.