From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ricardo Wurmus Subject: [PATCH] Update Julia to 0.3.10. Date: Mon, 20 Jul 2015 11:15:24 +0200 Message-ID: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:52778) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZH7Br-0002cU-8L for guix-devel@gnu.org; Mon, 20 Jul 2015 05:16:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZH7Bl-0004OT-86 for guix-devel@gnu.org; Mon, 20 Jul 2015 05:16:51 -0400 Received: from venus.bbbm.mdc-berlin.de ([141.80.25.30]:42007) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZH7Bk-0004Nd-RR for guix-devel@gnu.org; Mon, 20 Jul 2015 05:16:45 -0400 Received: from localhost (localhost [127.0.0.1]) by venus.bbbm.mdc-berlin.de (Postfix) with ESMTP id AD39D380835 for ; Mon, 20 Jul 2015 11:16:42 +0200 (CEST) Received: from venus.bbbm.mdc-berlin.de ([127.0.0.1]) by localhost (venus.bbbm.mdc-berlin.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Q0BO5dd1h8mi for ; Mon, 20 Jul 2015 11:16:37 +0200 (CEST) Received: from HTCAONE.mdc-berlin.net (mab.citx.mdc-berlin.de [141.80.36.102]) by venus.bbbm.mdc-berlin.de (Postfix) with ESMTP for ; Mon, 20 Jul 2015 11:16:36 +0200 (CEST) List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: guix-devel --=-=-= Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 =E2=80=98(substitute* ...)=E2=80=99. --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename="0001-gnu-julia-Update-to-0.3.10.patch" >From 18fe9ec45fb0d8ece556603f03e4faa2d0db65df Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus 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 MAttrs(mattr, mattr+sizeof(mattr)/sizeof(mattr[0])); + EngineBuilder eb = EngineBuilder(engine_module) + .setEngineKind(EngineKind::JIT) -- 2.1.0 --=-=-=--