summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRicardo Wurmus <ricardo.wurmus@mdc-berlin.de>2015-07-20 11:12:31 +0200
committerRicardo Wurmus <ricardo.wurmus@mdc-berlin.de>2015-07-21 10:33:59 +0200
commit5ff0edaee6942a21d20624aade41a228932fb372 (patch)
treee6b3975e6ffe5c525f0b268fc0c9f8781b17df96
parent61ee4fdf05cf866c2c8b0d056104451e798d6567 (diff)
gnu: julia: Update to 0.3.10.
* gnu/packages/julia.scm (julia): Update to 0.3.10. * gnu/packages/patches/julia-0.3.10-fix-empty-array.patch: New file. * gnu-system.am (dist_patch_DATA): Add it.
-rw-r--r--gnu-system.am1
-rw-r--r--gnu/packages/julia.scm15
-rw-r--r--gnu/packages/patches/julia-0.3.10-fix-empty-array.patch13
3 files changed, 26 insertions, 3 deletions
diff --git a/gnu-system.am b/gnu-system.am
index 6302d22377d..62e791c2994 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -476,6 +476,7 @@ dist_patch_DATA = \
476 gnu/packages/patches/icecat-libvpx-1.4.patch \ 476 gnu/packages/patches/icecat-libvpx-1.4.patch \
477 gnu/packages/patches/irrlicht-mesa-10.patch \ 477 gnu/packages/patches/irrlicht-mesa-10.patch \
478 gnu/packages/patches/jbig2dec-ignore-testtest.patch \ 478 gnu/packages/patches/jbig2dec-ignore-testtest.patch \
479 gnu/packages/patches/julia-0.3.10-fix-empty-array.patch \
479 gnu/packages/patches/kmod-module-directory.patch \ 480 gnu/packages/patches/kmod-module-directory.patch \
480 gnu/packages/patches/lftp-dont-save-unknown-host-fingerprint.patch \ 481 gnu/packages/patches/lftp-dont-save-unknown-host-fingerprint.patch \
481 gnu/packages/patches/liba52-enable-pic.patch \ 482 gnu/packages/patches/liba52-enable-pic.patch \
diff --git a/gnu/packages/julia.scm b/gnu/packages/julia.scm
index 4473109f4ab..fc152c8720e 100644
--- a/gnu/packages/julia.scm
+++ b/gnu/packages/julia.scm
@@ -41,15 +41,16 @@
41(define-public julia 41(define-public julia
42 (package 42 (package
43 (name "julia") 43 (name "julia")
44 (version "0.3.6") 44 (version "0.3.10")
45 (source (origin 45 (source (origin
46 (method url-fetch) 46 (method url-fetch)
47 (uri (string-append 47 (uri (string-append
48 "https://github.com/JuliaLang/julia/releases/download/v" 48 "https://github.com/JuliaLang/julia/releases/download/v"
49 version "/julia-" version "_0c24dca65c.tar.gz")) 49 version "/julia-" version "_c8ceeefcc1.tar.gz"))
50 (sha256 50 (sha256
51 (base32 51 (base32
52 "1hnbc2blzr9bc27m3vsr127fhg0h5imgqlrx00jakf0my0ccw8gr")))) 52 "0j6mw6wr35lxid10nh9gz7k6wck3a90ic92w99n1r052325gl9r7"))
53 (patches (list (search-patch "julia-0.3.10-fix-empty-array.patch")))))
53 (build-system gnu-build-system) 54 (build-system gnu-build-system)
54 (arguments 55 (arguments
55 `(#:test-target "test" 56 `(#:test-target "test"
@@ -92,6 +93,14 @@
92 ("fftw" "libfftw3" "libfftw3.so") 93 ("fftw" "libfftw3" "libfftw3.so")
93 ("fftwf" "libfftw3f" "libfftw3f.so")))))) 94 ("fftwf" "libfftw3f" "libfftw3f.so"))))))
94 #t)) 95 #t))
96 ;; This phase will no longer be necessary in 0.3.11; see
97 ;; https://github.com/JuliaLang/julia/issues/12028
98 (add-before
99 'build 'fix-building-with-mcjit-llvm
100 (lambda _
101 (substitute* "src/cgutils.cpp"
102 (("addComdat\\(gv\\);") ""))
103 #t))
95 (add-before 104 (add-before
96 'build 'patch-include-path 105 'build 'patch-include-path
97 (lambda _ 106 (lambda _
diff --git a/gnu/packages/patches/julia-0.3.10-fix-empty-array.patch b/gnu/packages/patches/julia-0.3.10-fix-empty-array.patch
new file mode 100644
index 00000000000..b00f6549e34
--- /dev/null
+++ b/gnu/packages/patches/julia-0.3.10-fix-empty-array.patch
@@ -0,0 +1,13 @@
1See https://github.com/JuliaLang/julia/issues/11817
2
3--- a/src/codegen.cpp 2015-06-24 12:44:31.218674066 +0200
4+++ b/src/codegen.cpp 2015-04-23 11:19:50.000000000 +0200
5@@ -4551,7 +4551,7 @@
6 #ifdef V128_BUG
7 "-avx",
8 #endif
9- };
10+ ""};
11 SmallVector<std::string, 4> MAttrs(mattr, mattr+sizeof(mattr)/sizeof(mattr[0]));
12 EngineBuilder eb = EngineBuilder(engine_module)
13 .setEngineKind(EngineKind::JIT)