diff options
author | Marius Bakke <mbakke@fastmail.com> | 2020-03-28 08:59:35 +0100 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2020-03-28 08:59:35 +0100 |
commit | aebcbb27bc2f192cc06163251bab66a4ceb7b7d6 (patch) | |
tree | dacf7a32b648f04002ecad4cc047ec4ced0b668d | |
parent | a5cfb444d1c8f3ab88fb7f1f824d2d37f5099996 (diff) | |
download | patches-aebcbb27bc2f192cc06163251bab66a4ceb7b7d6.tar patches-aebcbb27bc2f192cc06163251bab66a4ceb7b7d6.tar.gz |
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.
-rw-r--r-- | gnu/packages/bdw-gc.scm | 9 | ||||
-rw-r--r-- | gnu/packages/make-bootstrap.scm | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/gnu/packages/bdw-gc.scm b/gnu/packages/bdw-gc.scm index ca2da249fe..112a161f94 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 b3610afc8e..7d80e4280b 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 |