build-system: Use 'sexp->gexp' for plain sexps.

This reduces memory allocations and list traversals during 'gexp->sexp',
'gexp-inputs', etc.

* guix/build-system/cargo.scm (cargo-build): Use 'sexp->gexp' for sexps
known to not contain file-like objects.  Change default #:phases to a
symbol.
* guix/build-system/cmake.scm (cmake-build, cmake-cross-build): Likewise.
* guix/build-system/copy.scm (copy-build): Likewise.
* guix/build-system/font.scm (font-build): Likewise.
* guix/build-system/glib-or-gtk.scm (glib-or-gtk-build): Likewise.
* guix/build-system/gnu.scm (%strip-flags, %strip-directories): New
variables.
(gnu-build): Use them.  Use 'sexp->gexp' where appropriate.
(gnu-cross-build): Likewise.
* guix/build-system/meson.scm (meson-build): Likewise.
* guix/build-system/perl.scm (perl-build): Likewise.
* guix/build-system/python.scm (python-build): Likewise.
* guix/build-system/ruby.scm (ruby-build): Likewise.
* guix/build-system/scons.scm (scons-build): Likewise.
* guix/build-system/texlive.scm (texlive-build): Likewise.
* guix/build-system/trivial.scm (trivial-build): Likewise.
* guix/build-system/waf.scm (waf-build): Likewise.
* guix/build-system/android-ndk.scm (android-ndk-build): Likewise.
* guix/build-system/ant.scm (ant-build): Likewise.
* guix/build-system/asdf.scm (asdf-build/source, asdf-build): Likewise.
* guix/build-system/chicken.scm (chicken-build): Likewise.
* guix/build-system/clojure.scm (clojure-build): Likewise.
(source->output-path, maybe-guile->guile): Remove.
* guix/build-system/dub.scm (dub-build): Likewise.
* guix/build-system/emacs.scm (emacs-build): Likewise.
* guix/build-system/go.scm (go-build): Likewise.
* guix/build-system/haskell.scm (haskell-build): Likewise.
* guix/build-system/julia.scm (julia-build): Likewise.
* guix/build-system/linux-module.scm (linux-module-build)
(linux-module-build-cross): Likewise.
* guix/build-system/maven.scm (maven-build): Likewise.
* guix/build-system/minify.scm (minify-build): Likewise.
* guix/build-system/node.scm (node-build): Likewise.
* guix/build-system/qt.scm (qt-build, qt-cross-build): Likewise.
* guix/build-system/r.scm (r-build): Likewise.
* guix/build-system/rakudo.scm (rakudo-build): Likewise.
* guix/build-system/renpy.scm (renpy-build): Likewise.
* guix/packages.scm (patch-and-repack): Use 'sexp->gexp' when SNIPPET is
a pair.
* guix/svn-download.scm (svn-multi-fetch): Use 'sexp->gexp' for
'svn-multi-reference-locations'.

1 files changed, 32 insertions, 21 deletions

diff --git a/guix/build-system/gnu.scm b/guix/build-system/gnu.scm
index 613deb7bb0..3fb1a241dd 100644
--- a/guix/build-system/gnu.scm
+++ b/guix/build-system/gnu.scm
@@ -330,6 +330,12 @@ standard packages used as implicit inputs of the GNU build system."
   ;; Typical names of Autotools "bootstrap" scripts.
   '("bootstrap" "bootstrap.sh" "autogen.sh"))
 
+(define %strip-flags
+  #~'("--strip-unneeded" "--enable-deterministic-archives"))
+
+(define %strip-directories
+  #~'("lib" "lib64" "libexec" "bin" "sbin"))
+
 (define* (gnu-build name inputs
                     #:key
                     guile source
@@ -345,10 +351,8 @@ standard packages used as implicit inputs of the GNU build system."
                     (parallel-tests? #t)
                     (patch-shebangs? #t)
                     (strip-binaries? #t)
-                    (strip-flags ''("--strip-unneeded"
-                                    "--enable-deterministic-archives"))
-                    (strip-directories ''("lib" "lib64" "libexec"
-                                          "bin" "sbin"))
+                    (strip-flags %strip-flags)
+                    (strip-directories %strip-directories)
                     (validate-runpath? #t)
                     (make-dynamic-linker-cache? #t)
                     (license-file-regexp %license-file-regexp)
@@ -381,7 +385,7 @@ are allowed to refer to."
   (define builder
     (with-imported-modules imported-modules
       #~(begin
-          (use-modules #$@modules)
+          (use-modules #$@(sexp->gexp modules))
 
           #$(with-build-variables inputs outputs
               #~(gnu-build #:source #+source
@@ -389,13 +393,20 @@ are allowed to refer to."
                            #:build #$build
                            #:outputs %outputs
                            #:inputs %build-inputs
-                           #:search-paths '#$(map search-path-specification->sexp
-                                                  search-paths)
-                           #:phases #$phases
+                           #:search-paths '#$(sexp->gexp
+                                              (map search-path-specification->sexp
+                                                   search-paths))
+                           #:phases #$(if (pair? phases)
+                                          (sexp->gexp phases)
+                                          phases)
                            #:locale #$locale
-                           #:bootstrap-scripts #$bootstrap-scripts
-                           #:configure-flags #$configure-flags
-                           #:make-flags #$make-flags
+                           #:bootstrap-scripts #$(sexp->gexp bootstrap-scripts)
+                           #:configure-flags #$(if (pair? configure-flags)
+                                                   (sexp->gexp configure-flags)
+                                                   configure-flags)
+                           #:make-flags #$(if (pair? make-flags)
+                                              (sexp->gexp make-flags)
+                                              make-flags)
                            #:out-of-source? #$out-of-source?
                            #:tests? #$tests?
                            #:test-target #$test-target
@@ -472,10 +483,8 @@ is one of `host' or `target'."
                           (parallel-build? #t) (parallel-tests? #t)
                           (patch-shebangs? #t)
                           (strip-binaries? #t)
-                          (strip-flags ''("--strip-unneeded"
-                                          "--enable-deterministic-archives"))
-                          (strip-directories ''("lib" "lib64" "libexec"
-                                                "bin" "sbin"))
+                          (strip-flags %strip-flags)
+                          (strip-directories %strip-directories)
                           (validate-runpath? #t)
 
                           ;; We run 'ldconfig' to generate ld.so.cache and it
@@ -498,7 +507,7 @@ cross-built inputs, and NATIVE-INPUTS are inputs that run on the build
 platform."
   (define builder
     #~(begin
-        (use-modules #$@modules)
+        (use-modules #$@(sexp->gexp modules))
 
         (define %build-host-inputs
           (map (lambda (tuple)
@@ -523,11 +532,13 @@ platform."
                    #:outputs %outputs
                    #:inputs %build-target-inputs
                    #:native-inputs %build-host-inputs
-                   #:search-paths '#$(map search-path-specification->sexp
-                                          search-paths)
-                   #:native-search-paths '#$(map
-                                             search-path-specification->sexp
-                                             native-search-paths)
+                   #:search-paths '#$(sexp->gexp
+                                      (map search-path-specification->sexp
+                                           search-paths))
+                   #:native-search-paths '#$(sexp->gexp
+                                             (map
+                                              search-path-specification->sexp
+                                              native-search-paths))
                    #:phases #$phases
                    #:locale #$locale
                    #:bootstrap-scripts #$bootstrap-scripts