[bug#29566] [PATCH] utils: Fix cond-expand for Guile 2.0.

[bug#29566] [PATCH] utils: Fix cond-expand for Guile 2.0.

[Eric Bavier]

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

This patch removes the use of 'guile-2.0', which is not a supported feature, in cond-expand.  It fixes 'make check' and normal usage for Guix built with Guile 2.0. (2.0.14 tested).

Eric Bavier, Scientific Libraries, Cray Inc.


[-- Attachment #2: 0001-utils-Fix-cond-expand-for-Guile-2.0.patch --]
[-- Type: application/octet-stream, Size: 1021 bytes --]

From daaeff8ec8c94fae416ceeaf16a57d92ba32e6b6 Mon Sep 17 00:00:00 2001
From: Eric Bavier <bavier@cray.com>
Date: Mon, 4 Dec 2017 10:33:31 -0600
Subject: [PATCH] utils: Fix cond-expand for Guile 2.0.

* guix/build/download.scm (tls-wrap): Use 'guile-2.2' feature instead.
---
 guix/build/download.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/guix/build/download.scm b/guix/build/download.scm
index 4490d22..609a100 100644
--- a/guix/build/download.scm
+++ b/guix/build/download.scm
@@ -308,10 +308,10 @@ host name without trailing dot."
       (register-tls-record-port record port)
 
       ;; Write HTTP requests line by line rather than byte by byte:
-      ;; <https://bugs.gnu.org/22966>.  This is not possible on Guile 2.0.
+      ;; <https://bugs.gnu.org/22966>.  This is possible with Guile >= 2.2.
       (cond-expand
-        (guile-2.0 #f)
-        (else (setvbuf record 'line)))
+        (guile-2.2 (setvbuf record 'line))
+        (else #f))
 
       record)))
 
-- 
1.8.5.6

[bug#29566] [PATCH] utils: Fix cond-expand for Guile 2.0.

[Ludovic Courtès]

Eric Bavier <bavier@cray.com> skribis:

> From daaeff8ec8c94fae416ceeaf16a57d92ba32e6b6 Mon Sep 17 00:00:00 2001
> From: Eric Bavier <bavier@cray.com>
> Date: Mon, 4 Dec 2017 10:33:31 -0600
> Subject: [PATCH] utils: Fix cond-expand for Guile 2.0.
>
> * guix/build/download.scm (tls-wrap): Use 'guile-2.2' feature instead.

LGTM!

Ludo’, who thought this had already been committed.

bug#29566: [PATCH] utils: Fix cond-expand for Guile 2.0.

[Eric Bavier]

Pushed in 7f04197fef905790fd392f8d686d00ae95a0d04c

Sorry for the delay, I need to get a better system set up for pushing changes.

Eric Bavier, Scientific Libraries, Cray Inc.

________________________________________
From: Ludovic Courtès <ludo@gnu.org>
Sent: Friday, December 8, 2017 03:39
To: Eric Bavier
Cc: 29566@debbugs.gnu.org
Subject: Re: [bug#29566] [PATCH] utils: Fix cond-expand for Guile 2.0.

Eric Bavier <bavier@cray.com> skribis:

> From daaeff8ec8c94fae416ceeaf16a57d92ba32e6b6 Mon Sep 17 00:00:00 2001
> From: Eric Bavier <bavier@cray.com>
> Date: Mon, 4 Dec 2017 10:33:31 -0600
> Subject: [PATCH] utils: Fix cond-expand for Guile 2.0.
>
> * guix/build/download.scm (tls-wrap): Use 'guile-2.2' feature instead.

LGTM!

Ludo’, who thought this had already been committed.