Re: 01/01: gnu: mit-scheme: Update to 10.1.3.

Re: 01/01: gnu: mit-scheme: Update to 10.1.3.

[Mark H Weaver]

Hi Kei,

guix-commits@gnu.org writes:

> kkebreau pushed a commit to branch master
> in repository guix.
>
> commit d870cc5e8acfed6fee318a66c3ffc7244aa376a1
> Author: Kei Kebreau <kkebreau@posteo.net>
> Date:   Thu Dec 13 08:32:50 2018 -0500
>
>     gnu: mit-scheme: Update to 10.1.3.
>     
>     * gnu/packages/scheme.scm (mit-scheme): Update to 10.1.3.
>     [arguments]: Update 'unpack', 'configure-doc', and 'install-doc' phases
>     accordingly.
>     [supported-systems]: Limit to i686-linux and x86_64-linux.

[...]

> @@ -177,24 +171,21 @@
>                                  ("x86_64-linux"
>                                   (string-append version "-x86-64"))
>                                  ("i686-linux"
> -                                 (string-append version "-i386"))
> -                                (_
> -                                 (string-append "c-" version)))
> +                                 (string-append version "-i386")))
>                                ".tar.gz"))
>            (sha256
>             (match (%current-system)
>               ("x86_64-linux"
>                (base32
> -               "1skzxxhr0iq96bf0j5m7mvf3i4sppfyfa6gpqn34mwgkw1fx8274"))
> +               "03m7cc035w3avs91j2pcz9f15ssgvgp3rm045d1vbydqrkzfyw8k"))
>               ("i686-linux"
>                (base32
> -               "1fmlpnhf5a75db93phajh4ysbdgrgl72v45lk3kznriprl0a7jc6"))
> -             (_
> -              (base32
> -               "0w5ib5vsidihb4hb6fma3sp596ykr8izagm57axvgd6lqzwicsjg"))))))))
> +               "05sjyz90xxfnmi87qv8x0yx0fcallnzl1dciygdafp317pn489is"))))))))

Without the fallback cases in these 'match' forms, this package
definition raises an exception when asked to generate the derivation on
non-Intel systems.  Ludovic partly reverted your changes here:

  https://git.savannah.gnu.org/cgit/guix.git/commit/?id=966629a114fd90153784dfdbe5e332e0ac94f1bc

This commit also broke the 'guix' package on armhf-linux, and probably
on other non-Intel systems as well,

  https://hydra.gnu.org/build/3281991

although admittedly I found this surprising.

>      ;; Fails to build on MIPS, see <http://bugs.gnu.org/18221>.
> -    (supported-systems '("x86_64-linux" "i686-linux" "armhf-linux"))
> +    ;; Also, the portable C version of MIT/GNU Scheme did not work in time for
> +    ;; release in version 10.1.
> +    (supported-systems '("x86_64-linux" "i686-linux"))

In general, please do not remove a system from 'supported-systems'
unless there is good reason to believe that it would be prohibitively
difficult to support the package on that system.  If there is merely a
bug or some minor unfinished work that prevents a package from building
on a given system, that is not sufficient grounds to remove it from
'supported-systems'.

       Thanks,
         Mark

Re: 01/01: gnu: mit-scheme: Update to 10.1.3.

[Kei Kebreau]

Mark H Weaver <mhw@netris.org> writes:

> Hi Kei,
>
> guix-commits@gnu.org writes:
>
>> kkebreau pushed a commit to branch master
>> in repository guix.
>>
>> commit d870cc5e8acfed6fee318a66c3ffc7244aa376a1
>> Author: Kei Kebreau <kkebreau@posteo.net>
>> Date:   Thu Dec 13 08:32:50 2018 -0500
>>
>>     gnu: mit-scheme: Update to 10.1.3.
>>     
>>     * gnu/packages/scheme.scm (mit-scheme): Update to 10.1.3.
>>     [arguments]: Update 'unpack', 'configure-doc', and 'install-doc' phases
>>     accordingly.
>>     [supported-systems]: Limit to i686-linux and x86_64-linux.
>
> [...]
>
>> @@ -177,24 +171,21 @@
>>                                  ("x86_64-linux"
>>                                   (string-append version "-x86-64"))
>>                                  ("i686-linux"
>> -                                 (string-append version "-i386"))
>> -                                (_
>> -                                 (string-append "c-" version)))
>> +                                 (string-append version "-i386")))
>>                                ".tar.gz"))
>>            (sha256
>>             (match (%current-system)
>>               ("x86_64-linux"
>>                (base32
>> -               "1skzxxhr0iq96bf0j5m7mvf3i4sppfyfa6gpqn34mwgkw1fx8274"))
>> +               "03m7cc035w3avs91j2pcz9f15ssgvgp3rm045d1vbydqrkzfyw8k"))
>>               ("i686-linux"
>>                (base32
>> -               "1fmlpnhf5a75db93phajh4ysbdgrgl72v45lk3kznriprl0a7jc6"))
>> -             (_
>> -              (base32
>> -               "0w5ib5vsidihb4hb6fma3sp596ykr8izagm57axvgd6lqzwicsjg"))))))))
>> +               "05sjyz90xxfnmi87qv8x0yx0fcallnzl1dciygdafp317pn489is"))))))))
>
> Without the fallback cases in these 'match' forms, this package
> definition raises an exception when asked to generate the derivation on
> non-Intel systems.  Ludovic partly reverted your changes here:
>
>   https://git.savannah.gnu.org/cgit/guix.git/commit/?id=966629a114fd90153784dfdbe5e332e0ac94f1bc
>
> This commit also broke the 'guix' package on armhf-linux, and probably
> on other non-Intel systems as well,
>
>   https://hydra.gnu.org/build/3281991
>
> although admittedly I found this surprising.
>

For some reason, the removing the fallback case from the 'match' forms
didn't set off any alarm bells in my mind. My apologies.

>>      ;; Fails to build on MIPS, see <http://bugs.gnu.org/18221>.
>> -    (supported-systems '("x86_64-linux" "i686-linux" "armhf-linux"))
>> + ;; Also, the portable C version of MIT/GNU Scheme did not work in
>> time for
>> +    ;; release in version 10.1.
>> +    (supported-systems '("x86_64-linux" "i686-linux"))
>
> In general, please do not remove a system from 'supported-systems'
> unless there is good reason to believe that it would be prohibitively
> difficult to support the package on that system.  If there is merely a
> bug or some minor unfinished work that prevents a package from building
> on a given system, that is not sufficient grounds to remove it from
> 'supported-systems'.
>
>        Thanks,
>          Mark

Understood. Thanks to you and Ludovic for cleaning up my small mess.

Re: 01/01: gnu: mit-scheme: Update to 10.1.3.

[Danny Milosavljevic]

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

Hi Kei,

On Sat, 15 Dec 2018 13:51:43 -0500
Kei Kebreau <kkebreau@posteo.net> wrote:

> Understood. Thanks to you and Ludovic for cleaning up my small mess.

I think it's only a workaround.

What happened to the MIT scheme C fallback?  I tried to fix it for good but then
the armhf-linux build still didn't work:

With the patch below (which may be wrong), I tried:

$ guix build --system=armhf-linux mit-scheme

and got:

>checking for native-code support... configure: error: unable to determine host architecture

If there was once a architecture-independent MIT scheme, let's use that one to
bootstrap the newer version, if possible.

You can put the following into your config.scm in order to emulate armhf-linux, which would
have caught this problem easily:

                   (service qemu-binfmt-service-type
                     (qemu-binfmt-configuration
                       (platforms (lookup-qemu-platforms "arm"))
                       (guix-support? #t)))

diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm
index c7ab00380..25852d2af 100644
--- a/gnu/packages/scheme.scm
+++ b/gnu/packages/scheme.scm
@@ -70,12 +70,7 @@
   #:use-module (ice-9 match))
 
 (define (mit-scheme-source-directory system version)
-  (string-append "mit-scheme-"
-                 (if (or (string-prefix? "x86_64" system)
-                         (string-prefix? "i686" system))
-                     ""
-                     "c-")
-                 version))
+  (string-append "mit-scheme-" version))
 
 (define-public mit-scheme
   (package
@@ -173,7 +168,7 @@
                                 ("i686-linux"
                                  (string-append version "-i386"))
                                 (_
-                                 (string-append "c-" version)))
+                                 version))
                               ".tar.gz"))
           (sha256
            (match (%current-system)
@@ -182,7 +177,10 @@
                "03m7cc035w3avs91j2pcz9f15ssgvgp3rm045d1vbydqrkzfyw8k"))
              ("i686-linux"
               (base32
-               "05sjyz90xxfnmi87qv8x0yx0fcallnzl1dciygdafp317pn489is"))))))))
+               "05sjyz90xxfnmi87qv8x0yx0fcallnzl1dciygdafp317pn489is"))
+             (_
+              (base32
+               "18kllckm3iky59wk3nvx41kfn56lpp468savvrk41agjza2hqqhy"))))))))
 
     ;; Fails to build on MIPS, see <http://bugs.gnu.org/18221>.
     ;; Also, the portable C version of MIT/GNU Scheme did not work in time for

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: 01/01: gnu: mit-scheme: Update to 10.1.3.

[Kei Kebreau]

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

Danny Milosavljevic <dannym@scratchpost.org> writes:

> Hi Kei,
>
> On Sat, 15 Dec 2018 13:51:43 -0500
> Kei Kebreau <kkebreau@posteo.net> wrote:
>
>> Understood. Thanks to you and Ludovic for cleaning up my small mess.
>
> I think it's only a workaround.
>
> What happened to the MIT scheme C fallback?  I tried to fix it for good but then
> the armhf-linux build still didn't work:
>

I pull the following quote from "Stable Release 10.1" on
https://www.gnu.org/software/mit-scheme/release.html:

"The portable C version is not included in this release because we were
unable to get it working in time."

Based on the above quote I'm assuming the C fallback is coming back, so
according to Mark's evaluation I shouldn't have removed armhf-linux from
the supported-systems.

> If there was once a architecture-independent MIT scheme, let's use that one to
> bootstrap the newer version, if possible.
>

It is possible. The architecture-independent version is the C-based
one. I'll look into your patch and follow changes upstream to see about
repairing the situation ASAP.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

Re: 01/01: gnu: mit-scheme: Update to 10.1.3.

[Kei Kebreau]

[-- Attachment #1.1: Type: text/plain, Size: 1346 bytes --]

Kei Kebreau <kkebreau@posteo.net> writes:

> Danny Milosavljevic <dannym@scratchpost.org> writes:
>
>> Hi Kei,
>>
>> On Sat, 15 Dec 2018 13:51:43 -0500
>> Kei Kebreau <kkebreau@posteo.net> wrote:
>>
>>> Understood. Thanks to you and Ludovic for cleaning up my small mess.
>>
>> I think it's only a workaround.
>>
>> What happened to the MIT scheme C fallback?  I tried to fix it for
>> good but then
>> the armhf-linux build still didn't work:
>>
>
> I pull the following quote from "Stable Release 10.1" on
> https://www.gnu.org/software/mit-scheme/release.html:
>
> "The portable C version is not included in this release because we were
> unable to get it working in time."
>
> Based on the above quote I'm assuming the C fallback is coming back, so
> according to Mark's evaluation I shouldn't have removed armhf-linux from
> the supported-systems.
>
>> If there was once a architecture-independent MIT scheme, let's use that one to
>> bootstrap the newer version, if possible.
>>
>
> It is possible. The architecture-independent version is the C-based
> one. I'll look into your patch and follow changes upstream to see about
> repairing the situation ASAP.

This patch gives an error related to an attempt to subtract two
incompatible pointers. The MIT/GNU Scheme home page mentions that the
SVM build is for 64-bit unix systems, however.


[-- Attachment #1.2: 0001-gnu-mit-scheme-Add-SVM-build.patch --]
[-- Type: text/plain, Size: 2683 bytes --]

From c3a7491dceb7cb81651a3c7a83cea0bb736c6738 Mon Sep 17 00:00:00 2001
From: Kei Kebreau <kkebreau@posteo.net>
Date: Mon, 17 Dec 2018 09:37:46 -0500
Subject: [PATCH] gnu: mit-scheme: Add SVM build.

* gnu/packages/scheme.scm (mit-scheme-source-directory): Adjust for the time
being.
* gnu/packages/scheme.scm (mit-scheme)[arguments]: Adjust 'build' phase
accordingly.
[inputs]: Adjust catch-all case in "source" input accordingly.
[supported-systems]: Add armhf-linux.
---
 gnu/packages/scheme.scm | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm
index 3c688e120..06812e2ef 100644
--- a/gnu/packages/scheme.scm
+++ b/gnu/packages/scheme.scm
@@ -74,7 +74,7 @@
                  (if (or (string-prefix? "x86_64" system)
                          (string-prefix? "i686" system))
                      ""
-                     "c-")
+                     "")
                  version))
 
 (define-public mit-scheme
@@ -113,8 +113,7 @@
                (if (or (string-prefix? "x86_64" system)
                        (string-prefix? "i686" system))
                    (invoke "make" "compile-microcode")
-                   (invoke "./etc/make-liarc.sh"
-                           (string-append "--prefix=" out)))
+                   (invoke "make"))
                #t)))
          (add-after 'configure 'configure-doc
            (lambda* (#:key outputs inputs #:allow-other-keys)
@@ -173,7 +172,7 @@
                                 ("i686-linux"
                                  (string-append version "-i386"))
                                 (_
-                                 (string-append "c-" version)))
+                                 (string-append version "-svm1")))
                               ".tar.gz"))
           (sha256
            (match (%current-system)
@@ -184,13 +183,11 @@
               (base32
                "05sjyz90xxfnmi87qv8x0yx0fcallnzl1dciygdafp317pn489is"))
              (_
-               (base32
-                ""))))))))
+              (base32
+               "0ka3l1m2jlyszm8kkv9pw33izmhw5j52rbfxx4zfqmwn7a5b3ays"))))))))
 
     ;; Fails to build on MIPS, see <http://bugs.gnu.org/18221>.
-    ;; Also, the portable C version of MIT/GNU Scheme did not work in time for
-    ;; release in version 10.1.
-    (supported-systems '("x86_64-linux" "i686-linux"))
+    (supported-systems '("x86_64-linux" "i686-linux" "armhf-linux"))
 
     (home-page "https://www.gnu.org/software/mit-scheme/")
     (synopsis "A Scheme implementation with integrated editor and debugger")
-- 
2.19.2


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]