[PATCH] gnu: julia: Drop ARM and MIPS support.

[PATCH] gnu: julia: Drop ARM and MIPS support.

[Ricardo Wurmus]

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

Hi Guix,

the first patch is to declare that Julia is unsupported on ARM and MIPS,
as previously discussed on IRC.

The second patch fixes the binary substitutes for Julia on the two
supported architectures by passing the MARCH flag with generic CPUs
("pentium4" is the lowest supported CPU for the i686 architecture).
This is needed as Julia's system image is otherwise targetted to the CPU
of the build host.

~~ Ricardo


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-julia-Mark-as-unsupported-on-ARM-and-MIPS.patch --]
[-- Type: text/x-patch, Size: 947 bytes --]

From cbc621d0b4289d8aa3229bc581ba96bbffa8e2bc Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de>
Date: Tue, 7 Apr 2015 10:39:25 +0200
Subject: [PATCH 1/2] gnu: julia: Mark as unsupported on ARM and MIPS.

* gnu/packages/julia.scm (julia): Add 'supported-systems' field.
---
 gnu/packages/julia.scm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/gnu/packages/julia.scm b/gnu/packages/julia.scm
index 844f1b2..efc867d 100644
--- a/gnu/packages/julia.scm
+++ b/gnu/packages/julia.scm
@@ -161,6 +161,9 @@
        ("pkg-config" ,pkg-config)
        ("python" ,python-2)
        ("which" ,which)))
+    ;; Julia is not officially released for ARM and MIPS.
+    ;; See https://github.com/JuliaLang/julia/issues/10639
+    (supported-systems '("i686-linux" "x86_64-linux"))
     (home-page "http://julialang.org/")
     (synopsis "High-performance dynamic language for technical computing")
     (description
-- 
2.1.0


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: 0002-gnu-julia-Pass-MARCH-make-flag.patch --]
[-- Type: text/x-patch, Size: 1822 bytes --]

From 5123a52cade8911da62841646a3d368f59b23bd1 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de>
Date: Tue, 7 Apr 2015 10:41:57 +0200
Subject: [PATCH 2/2] gnu: julia: Pass MARCH make flag.

* gnu/packages/julia.scm (julia)[arguments]: Pass "MARCH" flag for supported
  architectures.
---
 gnu/packages/julia.scm | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/julia.scm b/gnu/packages/julia.scm
index efc867d..036e485 100644
--- a/gnu/packages/julia.scm
+++ b/gnu/packages/julia.scm
@@ -35,7 +35,8 @@
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages python)
   #:use-module (gnu packages textutils)
-  #:use-module (gnu packages version-control))
+  #:use-module (gnu packages version-control)
+  #:use-module (ice-9 match))
 
 (define-public julia
   (package
@@ -51,7 +52,7 @@
                 "1hnbc2blzr9bc27m3vsr127fhg0h5imgqlrx00jakf0my0ccw8gr"))))
     (build-system gnu-build-system)
     (arguments
-     '(#:test-target "test"
+     `(#:test-target "test"
        #:modules ((ice-9 match)
                   (guix build gnu-build-system)
                   (guix build utils))
@@ -105,6 +106,14 @@
        #:make-flags
        (list
         (string-append "prefix=" (assoc-ref %outputs "out"))
+
+        ;; Passing the MARCH flag is necessary to build binary substitutes for
+        ;; the supported architectures.
+        ,(match (or (%current-target-system)
+                    (%current-system))
+           ("x86_64-linux" "MARCH=x86-64")
+           ("i686-linux" "MARCH=pentium4"))
+
         "CONFIG_SHELL=bash"     ;needed to build bundled libraries
         "USE_SYSTEM_LIBUV=0"    ;Julia expects a modified libuv
         "USE_SYSTEM_DSFMT=0"    ;not packaged for Guix and upstream has no
-- 
2.1.0

Re: [PATCH] gnu: julia: Drop ARM and MIPS support.

[Ludovic Courtès]

Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de> skribis:

> From cbc621d0b4289d8aa3229bc581ba96bbffa8e2bc Mon Sep 17 00:00:00 2001
> From: Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de>
> Date: Tue, 7 Apr 2015 10:39:25 +0200
> Subject: [PATCH 1/2] gnu: julia: Mark as unsupported on ARM and MIPS.
>
> * gnu/packages/julia.scm (julia): Add 'supported-systems' field.

OK.

> From 5123a52cade8911da62841646a3d368f59b23bd1 Mon Sep 17 00:00:00 2001
> From: Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de>
> Date: Tue, 7 Apr 2015 10:41:57 +0200
> Subject: [PATCH 2/2] gnu: julia: Pass MARCH make flag.
>
> * gnu/packages/julia.scm (julia)[arguments]: Pass "MARCH" flag for supported
>   architectures.

Makes sense to me.

Thanks for taking care of it!

Ludo’.