Patchwork [1/2] gnu: Add femtolisp.

login
register
mail settings
Submitter non such
Date Sept. 14, 2016, 12:03 p.m.
Message ID <87h99ieljb.fsf@we.make.ritual.n0.is>
Download mbox | patch
Permalink /patch/15627/
State New
Headers show

Comments

non such - Sept. 14, 2016, 12:03 p.m.

Andreas Enge - Sept. 18, 2016, 10:02 a.m.
Hello,

femtolisp fails on mips and arm:
   http://hydra.gnu.org:3000/build/1472987/nixlog/2/tail-reload
with the message
In file included from llt/llt.h:6:0,
                 from string.c:16:
llt/utils.h:27:4: error: #error "unknown architecture"
 #  error "unknown architecture"

Should it be disabled there?

Andreas
non such - Sept. 18, 2016, 12:20 p.m.
ng0 <ng0@we.make.ritual.n0.is> writes:

> [ Unknown signature status ]
> From 4061b7fb71a40591dd8e34ee147153aa0d1d9fdc Mon Sep 17 00:00:00 2001
> From: ng0 <ng0@we.make.ritual.n0.is>
> Date: Tue, 13 Sep 2016 20:19:57 +0000
> Subject: [PATCH] gnu: femtolisp: Remove custom "patch-makefile" phase.
>
> * gnu/packages/lisp.scm (femtolisp)[arguments]: Remove
> "patch-makefile" phase; specify test target; build "release"
> target instead of "default".
> ---
>  gnu/packages/lisp.scm | 14 +++-----------
>  1 file changed, 3 insertions(+), 11 deletions(-)
>
> diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm
> index 3461de4..c7b8f35 100644
> --- a/gnu/packages/lisp.scm
> +++ b/gnu/packages/lisp.scm
> @@ -503,19 +503,11 @@ the InterLisp Standard.")
>                    "04rnwllxnl86zw8c6pwxznn49bvkvh0f1lfliy085vjzvlq3rgja"))))
>        (build-system gnu-build-system)
>        (arguments
> -       `(#:make-flags '("CC=gcc")
> -         #:tests? #f ; No make check
> +       `(#:make-flags '("CC=gcc" "release")
> +         #:test-target "test"
>           #:phases
>           (modify-phases %standard-phases
>             (delete 'configure) ; No configure script
> -           ;; We have to remove the 'test phase because it requires
> -           ;; the flisp binary to be present. Instead we run
> -           ;; bootstrap.sh after the 'install phase.
> -           (add-before 'build 'patch-makefile
> -             (lambda _
> -               (substitute* "Makefile"
> -                 (("default: release test") "default: release"))
> -               #t))
>             (replace 'install ; Makefile has no 'install phase
>              (lambda* (#:key outputs #:allow-other-keys)
>                (let* ((out (assoc-ref outputs "out"))
> @@ -533,7 +525,7 @@ the InterLisp Standard.")
>                   (install-file "flisp.boot" bin))))))))
>        (synopsis "Scheme-like lisp implementation")
>        (description
> -       "@code{femtolisp} is a scheme-like lisp implementation with a
> +       "@code{femtolisp} is a Scheme-like lisp implementation with a

I just noticed this.. I need to send the patch again. Anyone up to
reviewing and applying it today so I can mark these threads as done?

>  simple, elegant Scheme dialect.  It is a lisp-1 with lexical scope.
>  The core is 12 builtin special forms and 33 builtin functions.")
>        (home-page "https://github.com/JeffBezanson/femtolisp")
> -- 
> 2.10.0
>
>

Andreas: I reported the failing builds upstream to get
conformation. https://github.com/JeffBezanson/femtolisp/issues/25
Ludovic Courtès - Sept. 20, 2016, 6:14 a.m.
Andreas Enge <andreas@enge.fr> skribis:

> femtolisp fails on mips and arm:
>    http://hydra.gnu.org:3000/build/1472987/nixlog/2/tail-reload
> with the message
> In file included from llt/llt.h:6:0,
>                  from string.c:16:
> llt/utils.h:27:4: error: #error "unknown architecture"
>  #  error "unknown architecture"
>
> Should it be disabled there?

Definitely.  It would be worth checking in that file the set of
supported architectures, and putting them in ‘supported-platforms’.

Ludo’.
ng0 - Sept. 21, 2016, 10:37 a.m.
Ludovic Courtès <ludo@gnu.org> writes:

> Andreas Enge <andreas@enge.fr> skribis:
>
>> femtolisp fails on mips and arm:
>>    http://hydra.gnu.org:3000/build/1472987/nixlog/2/tail-reload
>> with the message
>> In file included from llt/llt.h:6:0,
>>                  from string.c:16:
>> llt/utils.h:27:4: error: #error "unknown architecture"
>>  #  error "unknown architecture"
>>
>> Should it be disabled there?
>
> Definitely.  It would be worth checking in that file the set of
> supported architectures, and putting them in ‘supported-platforms’.
>
> Ludo’.
>

Okay, I will fix it. In the meantime should the additional patch which
is unrelated to this change be applied.
Ludovic Courtès - Sept. 21, 2016, 3:33 p.m.
ng0 <ngillmann@runbox.com> skribis:

> Ludovic Courtès <ludo@gnu.org> writes:
>
>> Andreas Enge <andreas@enge.fr> skribis:
>>
>>> femtolisp fails on mips and arm:
>>>    http://hydra.gnu.org:3000/build/1472987/nixlog/2/tail-reload
>>> with the message
>>> In file included from llt/llt.h:6:0,
>>>                  from string.c:16:
>>> llt/utils.h:27:4: error: #error "unknown architecture"
>>>  #  error "unknown architecture"
>>>
>>> Should it be disabled there?
>>
>> Definitely.  It would be worth checking in that file the set of
>> supported architectures, and putting them in ‘supported-platforms’.
>>
>> Ludo’.
>>
>
> Okay, I will fix it. In the meantime should the additional patch which
> is unrelated to this change be applied.

Sorry, I’ll let whoever reviewed reply.  :-)

Ludo’.
Ricardo Wurmus - Sept. 21, 2016, 7:30 p.m.
Ludovic Courtès <ludo@gnu.org> writes:

> ng0 <ngillmann@runbox.com> skribis:
[…]
>> Okay, I will fix it. In the meantime should the additional patch which
>> is unrelated to this change be applied.
>
> Sorry, I’ll let whoever reviewed reply.  :-)

That would be me :)

I pushed the patch to remove the custom build phase.  It’s in master as
f7fe5f7a3e26676657265e98073b9914baf615f1.

~~ Ricardo

Patch

From 4061b7fb71a40591dd8e34ee147153aa0d1d9fdc Mon Sep 17 00:00:00 2001
From: ng0 <ng0@we.make.ritual.n0.is>
Date: Tue, 13 Sep 2016 20:19:57 +0000
Subject: [PATCH] gnu: femtolisp: Remove custom "patch-makefile" phase.

* gnu/packages/lisp.scm (femtolisp)[arguments]: Remove
"patch-makefile" phase; specify test target; build "release"
target instead of "default".
---
 gnu/packages/lisp.scm | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm
index 3461de4..c7b8f35 100644
--- a/gnu/packages/lisp.scm
+++ b/gnu/packages/lisp.scm
@@ -503,19 +503,11 @@  the InterLisp Standard.")
                   "04rnwllxnl86zw8c6pwxznn49bvkvh0f1lfliy085vjzvlq3rgja"))))
       (build-system gnu-build-system)
       (arguments
-       `(#:make-flags '("CC=gcc")
-         #:tests? #f ; No make check
+       `(#:make-flags '("CC=gcc" "release")
+         #:test-target "test"
          #:phases
          (modify-phases %standard-phases
            (delete 'configure) ; No configure script
-           ;; We have to remove the 'test phase because it requires
-           ;; the flisp binary to be present. Instead we run
-           ;; bootstrap.sh after the 'install phase.
-           (add-before 'build 'patch-makefile
-             (lambda _
-               (substitute* "Makefile"
-                 (("default: release test") "default: release"))
-               #t))
            (replace 'install ; Makefile has no 'install phase
             (lambda* (#:key outputs #:allow-other-keys)
               (let* ((out (assoc-ref outputs "out"))
@@ -533,7 +525,7 @@  the InterLisp Standard.")
                  (install-file "flisp.boot" bin))))))))
       (synopsis "Scheme-like lisp implementation")
       (description
-       "@code{femtolisp} is a scheme-like lisp implementation with a
+       "@code{femtolisp} is a Scheme-like lisp implementation with a
 simple, elegant Scheme dialect.  It is a lisp-1 with lexical scope.
 The core is 12 builtin special forms and 33 builtin functions.")
       (home-page "https://github.com/JeffBezanson/femtolisp")
-- 
2.10.0