02/02: gnu: guile-static: Provide a libgc variant with statically built libraries.

[guix-commits]

mbakke pushed a commit to branch core-updates
in repository guix.

commit aebcbb27bc2f192cc06163251bab66a4ceb7b7d6
Author: Marius Bakke <address@hidden>
AuthorDate: Sat Mar 28 08:59:35 2020 +0100

    gnu: guile-static: Provide a libgc variant with statically built libraries.
    
    * gnu/packages/bdw-gc.scm (libgc/static-libs): New public variable.
    * gnu/packages/make-bootstrap.scm (%guile-static)[propagated-inputs]: Change
    from LIBGC to LIBGC/STATIC-LIBS.
---
 gnu/packages/bdw-gc.scm         | 9 +++++++++
 gnu/packages/make-bootstrap.scm | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/bdw-gc.scm b/gnu/packages/bdw-gc.scm
index ca2da24..112a161 100644
--- a/gnu/packages/bdw-gc.scm
+++ b/gnu/packages/bdw-gc.scm
@@ -24,6 +24,7 @@
   #:use-module (guix licenses)
   #:use-module (guix packages)
   #:use-module (guix download)
+  #:use-module (guix utils)
   #:use-module (guix build-system gnu)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages hurd))
@@ -84,6 +85,14 @@ C or C++ programs, though that is not its primary goal.")
 
    (license (x11-style (string-append home-page "license.txt")))))
 
+;; TODO: Add a static output in libgc in the next rebuild cycle.
+(define-public libgc/static-libs
+  (package/inherit
+   libgc
+   (arguments (substitute-keyword-arguments (package-arguments libgc)
+                ((#:configure-flags flags ''())
+                 `(cons "--enable-static" ,flags))))))
+
 (define-public libgc-7
   (package
    (inherit libgc)
diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm
index b3610af..7d80e42 100644
--- a/gnu/packages/make-bootstrap.scm
+++ b/gnu/packages/make-bootstrap.scm
@@ -699,7 +699,7 @@ for `sh' in $PATH, and without nscd, and with static NSS 
modules."
                      ,@(package-inputs guile-2.2)))
 
                   (propagated-inputs
-                   `(("bdw-gc" ,libgc)
+                   `(("bdw-gc" ,libgc/static-libs)
                      ,@(alist-delete "bdw-gc"
                                      (package-propagated-inputs guile-2.0))))
                   (arguments