Patchwork gnu: femtolisp: Remove support for mips and armhf.

login
register
mail settings
Submitter ng0
Date Sept. 27, 2016, 8:13 a.m.
Message ID <87bmz9pxoe.fsf@we.make.ritual.n0.is>
Download mbox | patch
Permalink /patch/16067/
State New
Headers show

Comments

ng0 - Sept. 27, 2016, 8:13 a.m.
Ludovic Courtès <ludo@gnu.org> writes:

> 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’.
>>
>> I'm not exactly sure what's supported, I found win32, osx, freebsd,
>> openbsd, and that's it.
>
> Sorry, I really meant supported architectures, which is what utils.h
> seems to be about (although I don’t have the source here to check).
> Could you check the #ifdefs in there?

#if defined( __amd64__ ) || defined( _M_AMD64 )
#  define ARCH_X86_64
#  define __CPU__ 686
#elif defined( _M_IX86 )//msvs, intel, digital mars, watcom
#  if ! defined( __386__ )
#    error "unsupported target: 16-bit x86"
#  endif
#  define ARCH_X86
#  define __CPU__  ( _M_IX86 + 86 )
#elif defined( __i686__ )//gnu c
#  define ARCH_X86
#  define __CPU__ 686
#elif defined( __i586__ )//gnu c
#  define ARCH_X86
#  define __CPU__ 586
#elif defined( __i486__ )//gnu c
#  define ARCH_X86
#  define __CPU__ 486
#elif defined( __i386__ )//gnu c
#  define ARCH_X86
#  define __CPU__ 386
#else
#  error "unknown architecture"
#endif


>> +      ;; armhf and mips64el fail to build, it has been reported upstream:
>> +      ;; https://github.com/JeffBezanson/femtolisp/issues/25
>> +      (supported-systems
>> +       (and
>> +        (delete "armhf-linux" %supported-systems)
>> +        (delete "mips64el-linux" %supported-systems)
>> +        #t))
>
> ‘supported-systems’ must be a list of strings, so:
>
>   (fold delete %supported-systems
>         '("armhf-linux" "mips64el-linux"))
>
> Thanks,
> Ludo’.
>
Leo Famulari - Sept. 27, 2016, 4:30 p.m.
On Tue, Sep 27, 2016 at 08:13:53AM +0000, ng0 wrote:
> Subject: [PATCH] gnu: femtolisp: Remove support for mips and armhf.
> 
> * gnu/packages/lisp.scm (femtolisp)[supported-systems]: New field,
> remove support for mips64el and armhf.

Thanks, pushed!

Patch

From 32c4d64ada9ab2573a00385b15b2b0a03a6fa44f Mon Sep 17 00:00:00 2001
From: ng0 <ngillmann@runbox.com>
Date: Thu, 22 Sep 2016 09:08:03 +0000
Subject: [PATCH] gnu: femtolisp: Remove support for mips and armhf.

* gnu/packages/lisp.scm (femtolisp)[supported-systems]: New field,
remove support for mips64el and armhf.
---
 gnu/packages/lisp.scm | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm
index d1180a7..439433a 100644
--- a/gnu/packages/lisp.scm
+++ b/gnu/packages/lisp.scm
@@ -3,7 +3,7 @@ 
 ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
 ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2016 Federico Beffa <beffa@fbengineering.ch>
-;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
+;;; Copyright © 2016 ng0 <ngillmann@runbox.com>
 ;;; Copyright © 2016 Andy Patterson <ajpatter@uwaterloo.ca>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -44,7 +44,8 @@ 
   #:use-module (gnu packages ed)
   #:use-module (gnu packages m4)
   #:use-module (gnu packages version-control)
-  #:use-module (ice-9 match))
+  #:use-module (ice-9 match)
+  #:use-module (srfi srfi-1))
 
 (define-public gcl
   (package
@@ -501,6 +502,11 @@  the InterLisp Standard.")
                 (sha256
                  (base32
                   "04rnwllxnl86zw8c6pwxznn49bvkvh0f1lfliy085vjzvlq3rgja"))))
+      ;; See "utils.h" for supported systems. Upstream bug:
+      ;; https://github.com/JeffBezanson/femtolisp/issues/25
+      (supported-systems
+       (fold delete %supported-systems
+             '("armhf-linux" "mips64el-linux")))
       (build-system gnu-build-system)
       (arguments
        `(#:make-flags '("CC=gcc" "release")
-- 
2.10.0