[bug#29085] [PATCH] Conditionally build json importer.

[bug#29085] [PATCH] Conditionally build json importer.

[Eric Bavier]

[-- Attachment #1: Type: text/plain, Size: 121 bytes --]

The JSON importer should only be built if the json module is available.

Eric Bavier, Scientific Libraries, Cray Inc.

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Conditionally-build-json-importer.patch --]
[-- Type: text/x-patch; name="0001-Conditionally-build-json-importer.patch", Size: 1013 bytes --]

From 10c9f49a3db00ecdd510ed20b8dc8384ca091968 Mon Sep 17 00:00:00 2001
From: Eric Bavier <bavier@cray.com>
Date: Fri, 6 Oct 2017 12:32:11 -0500
Subject: [PATCH] Conditionally build json importer.

* Makefile.am (MODULES): Add guix/scripts/import/json.scm when HAVE_GUILE_JSON.
---
 Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index d054f78..f49d3b0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -175,7 +175,6 @@ MODULES =					\
   guix/scripts/import/gnu.scm			\
   guix/scripts/import/nix.scm			\
   guix/scripts/import/hackage.scm		\
-  guix/scripts/import/json.scm  		\
   guix/scripts/import/elpa.scm  		\
   guix/scripts/import/texlive.scm  		\
   guix/scripts/environment.scm			\
@@ -203,6 +202,7 @@ MODULES +=					\
   guix/import/stackage.scm			\
   guix/scripts/import/crate.scm			\
   guix/scripts/import/gem.scm			\
+  guix/scripts/import/json.scm  		\
   guix/scripts/import/pypi.scm			\
   guix/scripts/import/stackage.scm
 
-- 
1.8.5.6

[bug#29085] [PATCH] Conditionally build json importer.

[Ludovic Courtès]

Eric Bavier <bavier@cray.com> skribis:

> From 10c9f49a3db00ecdd510ed20b8dc8384ca091968 Mon Sep 17 00:00:00 2001
> From: Eric Bavier <bavier@cray.com>
> Date: Fri, 6 Oct 2017 12:32:11 -0500
> Subject: [PATCH] Conditionally build json importer.
>
> * Makefile.am (MODULES): Add guix/scripts/import/json.scm when HAVE_GUILE_JSON.

Good catch, go for it!

You can use “build:” as the prefix in the subject line.

Thank you,
Ludo’.

bug#29085: [PATCH] Conditionally build json importer.

[Eric Bavier]

Pushed in 89618fa8b8d303a41591e52c7d8cabe3aa8f635d

Eric Bavier, Scientific Libraries, Cray Inc.

________________________________________
From: Ludovic Courtès <ludo@gnu.org>
Sent: Sunday, November 5, 2017 14:59
To: Eric Bavier
Cc: 29085@debbugs.gnu.org
Subject: Re: [bug#29085] [PATCH] Conditionally build json importer.

Eric Bavier <bavier@cray.com> skribis:

> From 10c9f49a3db00ecdd510ed20b8dc8384ca091968 Mon Sep 17 00:00:00 2001
> From: Eric Bavier <bavier@cray.com>
> Date: Fri, 6 Oct 2017 12:32:11 -0500
> Subject: [PATCH] Conditionally build json importer.
>
> * Makefile.am (MODULES): Add guix/scripts/import/json.scm when HAVE_GUILE_JSON.

Good catch, go for it!

You can use “build:” as the prefix in the subject line.

Thank you,
Ludo’.