From: Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de>
To: guix-devel <guix-devel@gnu.org>
Subject: [PATCH] Update Julia to 0.3.10.
Date: Mon, 20 Jul 2015 11:15:24 +0200 [thread overview]
Message-ID: <idjwpxv2nrn.fsf@bimsb-sys02.mdc-berlin.net> (raw)
[-- Attachment #1: Type: text/plain, Size: 187 bytes --]
This update requires two patches, one of which is in the form of a new
build phase. The patch file I added is a trivial fix that is hard to
apply with just ‘(substitute* ...)’.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-julia-Update-to-0.3.10.patch --]
[-- Type: text/x-patch, Size: 3535 bytes --]
From 18fe9ec45fb0d8ece556603f03e4faa2d0db65df Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de>
Date: Mon, 20 Jul 2015 11:12:31 +0200
Subject: [PATCH] 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.
---
gnu-system.am | 1 +
gnu/packages/julia.scm | 15 ++++++++++++---
gnu/packages/patches/julia-0.3.10-fix-empty-array.patch | 13 +++++++++++++
3 files changed, 26 insertions(+), 3 deletions(-)
create mode 100644 gnu/packages/patches/julia-0.3.10-fix-empty-array.patch
diff --git a/gnu-system.am b/gnu-system.am
index f67e077..f798007 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -475,6 +475,7 @@ dist_patch_DATA = \
gnu/packages/patches/icecat-libvpx-1.4.patch \
gnu/packages/patches/irrlicht-mesa-10.patch \
gnu/packages/patches/jbig2dec-ignore-testtest.patch \
+ gnu/packages/patches/julia-0.3.10-fix-empty-array.patch \
gnu/packages/patches/kmod-module-directory.patch \
gnu/packages/patches/lftp-dont-save-unknown-host-fingerprint.patch \
gnu/packages/patches/liba52-enable-pic.patch \
diff --git a/gnu/packages/julia.scm b/gnu/packages/julia.scm
index 4473109..fc152c8 100644
--- a/gnu/packages/julia.scm
+++ b/gnu/packages/julia.scm
@@ -41,15 +41,16 @@
(define-public julia
(package
(name "julia")
- (version "0.3.6")
+ (version "0.3.10")
(source (origin
(method url-fetch)
(uri (string-append
"https://github.com/JuliaLang/julia/releases/download/v"
- version "/julia-" version "_0c24dca65c.tar.gz"))
+ version "/julia-" version "_c8ceeefcc1.tar.gz"))
(sha256
(base32
- "1hnbc2blzr9bc27m3vsr127fhg0h5imgqlrx00jakf0my0ccw8gr"))))
+ "0j6mw6wr35lxid10nh9gz7k6wck3a90ic92w99n1r052325gl9r7"))
+ (patches (list (search-patch "julia-0.3.10-fix-empty-array.patch")))))
(build-system gnu-build-system)
(arguments
`(#:test-target "test"
@@ -92,6 +93,14 @@
("fftw" "libfftw3" "libfftw3.so")
("fftwf" "libfftw3f" "libfftw3f.so"))))))
#t))
+ ;; This phase will no longer be necessary in 0.3.11; see
+ ;; https://github.com/JuliaLang/julia/issues/12028
+ (add-before
+ 'build 'fix-building-with-mcjit-llvm
+ (lambda _
+ (substitute* "src/cgutils.cpp"
+ (("addComdat\\(gv\\);") ""))
+ #t))
(add-before
'build 'patch-include-path
(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 0000000..b00f654
--- /dev/null
+++ b/gnu/packages/patches/julia-0.3.10-fix-empty-array.patch
@@ -0,0 +1,13 @@
+See https://github.com/JuliaLang/julia/issues/11817
+
+--- a/src/codegen.cpp 2015-06-24 12:44:31.218674066 +0200
++++ b/src/codegen.cpp 2015-04-23 11:19:50.000000000 +0200
+@@ -4551,7 +4551,7 @@
+ #ifdef V128_BUG
+ "-avx",
+ #endif
+- };
++ ""};
+ SmallVector<std::string, 4> MAttrs(mattr, mattr+sizeof(mattr)/sizeof(mattr[0]));
+ EngineBuilder eb = EngineBuilder(engine_module)
+ .setEngineKind(EngineKind::JIT)
--
2.1.0
next reply other threads:[~2015-07-20 9:16 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-20 9:15 Ricardo Wurmus [this message]
2015-07-20 15:57 ` [PATCH] Update Julia to 0.3.10 Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=idjwpxv2nrn.fsf@bimsb-sys02.mdc-berlin.net \
--to=ricardo.wurmus@mdc-berlin.de \
--cc=guix-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.