From patchwork Thu Oct 15 07:35:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tim Howes X-Patchwork-Id: 24623 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 725C927BBED; Thu, 15 Oct 2020 08:44:37 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 3A99227BBEC for ; Thu, 15 Oct 2020 08:44:36 +0100 (BST) Received: from localhost ([::1]:57234 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kSxwB-000285-AR for patchwork@mira.cbaines.net; Thu, 15 Oct 2020 03:44:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40248) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kSxvh-00025f-F7 for guix-patches@gnu.org; Thu, 15 Oct 2020 03:44:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42521) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kSxve-0005NE-9l for guix-patches@gnu.org; Thu, 15 Oct 2020 03:44:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kSxve-0005LP-8L for guix-patches@gnu.org; Thu, 15 Oct 2020 03:44:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#44004] [PATCH] gnu: julia: Update to 1.5.2. Resent-From: Tim Howes Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 15 Oct 2020 07:44:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 44004 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 44004@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.160274783020515 (code B ref -1); Thu, 15 Oct 2020 07:44:02 +0000 Received: (at submit) by debbugs.gnu.org; 15 Oct 2020 07:43:50 +0000 Received: from localhost ([127.0.0.1]:54067 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kSxvK-0005Ki-Kr for submit@debbugs.gnu.org; Thu, 15 Oct 2020 03:43:50 -0400 Received: from lists.gnu.org ([209.51.188.17]:45838) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kSxvF-0005KW-Er for submit@debbugs.gnu.org; Thu, 15 Oct 2020 03:43:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40158) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kSxvF-00022u-6Z for guix-patches@gnu.org; Thu, 15 Oct 2020 03:43:37 -0400 Received: from 66-38.147.122.lavabit.com ([38.147.122.66]:26310 helo=lavabit.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kSxvA-0005GW-Hi for guix-patches@gnu.org; Thu, 15 Oct 2020 03:43:34 -0400 Received: from localhost.localdomain (158-51-80-100.pool.common.net [158.51.80.100]) by lavabit.com with ESMTP id HGD7A1YNZKZU for ; Thu, 15 Oct 2020 02:35:15 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lavabit.com; s=bazinga; t=1602747315; bh=g5yhq4MCZDhFg6VmkmdAeHzJcGytJ7ExxEXqUM17o8g=; h=User-agent:From:To:Subject:Date:Message-ID:MIME-Version: Content-Type; b=VQolTcgJ23ICMWXnOngtMTQu9YvN2r9vqgcNODmH7lze+fss4YrZX9AZtbR+x7mzH grCMTIqYE0TXdrqEBxq9kee5bu8BYjtYvJg35agexqOrqOEQq3PvtlKEMLxFhKAeek Drx8wzo4/VPZ/TcCra4eB+Qqax1Abhjc8rfnWs+mu7j70cccEtGLl3MbRvEgXSu99K f44hEg1M+obegYb+GZ9n73GQUJQXxAzV1TEegUSWXOI/fVyl9fZG7Z9eVF2PNa/hux RieOso5ERR5Cr+YGS8PInuOGwInR90tkHEn/I5EpkAeMYQkcOxM/dnN7kshhIgQNx+ H6HbHkaASOC6Q== User-agent: mu4e 1.4.13; emacs 27.1 Date: Thu, 15 Oct 2020 00:35:14 -0700 Message-ID: <87tuuw3psd.fsf@lavabit.com> MIME-Version: 1.0 Received-SPF: pass client-ip=38.147.122.66; envelope-from=timhowes@lavabit.com; helo=lavabit.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/15 03:33:06 X-ACL-Warn: Detected OS = Linux 3.x [generic] [fuzzy] X-Spam_score_int: 9 X-Spam_score: 0.9 X-Spam_bar: / X-Spam_report: (0.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_OTHER_BAD_TLD=1.999, RDNS_DYNAMIC=0.982, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, TVD_RCVD_IP=0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: Tim Howes , Tim Howes via Guix-patches X-Patchwork-Original-From: Tim Howes via Guix-patches via From: Tim Howes X-getmail-retrieved-from-mailbox: Patches Hello, This patch updates julia to version 1.5.2 and makes corresponding changes to llvm-julia so that it now uses llvm-9. I used the list of llvm patches for version 9 found at https://github.com/JuliaLang/julia/blob/v1.5.2/deps/llvm.mk#L399-L414 I added fixes for broken tests and removed fixes that were no longer necessary. It appears to build correctly, but please let me know if any additional changes are needed. Thanks, Tim From 1acf702e2a221d039a727e9d7b8fe8213264626d Mon Sep 17 00:00:00 2001 From: Tim Howes Date: Wed, 14 Oct 2020 20:05:28 -0700 Subject: [PATCH] gnu: julia: Update to 1.5.2. * gnu/packages/julia.scm (libuv-julia): No change to libuv.version. (julia-patch): Update to 1.5.2. (llvm-julia)[inherit]: Update to use llvm-9. [source]: Apply patches for llvm-9 from deps/llvm.mk. (julia): Update to 1.5.2. [source]: Remove substitutions for precompile.jl and cmdlineargs.jl. Add a substitution for Dates/io tests. Set --depwarn=error for tests. [arguments]: Set LLVM_VER=9.0.1. --- gnu/packages/julia.scm | 113 ++++++++++++++++++----------------------- 1 file changed, 49 insertions(+), 64 deletions(-) diff --git a/gnu/packages/julia.scm b/gnu/packages/julia.scm index 78488a4e99..65fa726d92 100644 --- a/gnu/packages/julia.scm +++ b/gnu/packages/julia.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2015, 2016, 2017 Ricardo Wurmus ;;; Copyright © 2016, 2020 Efraim Flashner ;;; Copyright © 2020 Nicolò Balzarotti +;;; Copyright © 2020 Tim Howes ;;; ;;; This file is part of GNU Guix. ;;; @@ -53,7 +54,7 @@ (let ((commit "35b1504507a7a4168caae3d78db54d1121b121e1") (revision "1")) ;; When upgrading Julia, also upgrade this. Get the commit from - ;; https://github.com/JuliaLang/julia/blob/v1.4.1/deps/libuv.version + ;; https://github.com/JuliaLang/julia/blob/v1.5.2/deps/libuv.version (package (inherit libuv) (name "libuv-julia") @@ -103,7 +104,7 @@ "/deps/patches/" name ".patch")) (define (julia-patch name sha) - (let ((version "1.4.1")) + (let ((version "1.5.2")) (origin (method url-fetch) (uri (julia-patch-url version name)) (sha256 (base32 sha)) @@ -111,63 +112,52 @@ (define llvm-julia (package - (inherit llvm-8) + (inherit llvm-9) (name "llvm-julia") (source (origin - (inherit (package-source llvm-8)) + (inherit (package-source llvm-9)) ;; Those patches are inside the Julia source repo. ;; They are _not_ Julia specific (https://github.com/julialang/julia#llvm) ;; but they are required to build Julia. ;; Discussion: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=919628 (patches - (map (match-lambda - ((name hash) - (julia-patch name hash))) - (list - '("llvm-7.0-D44650" - "1h55kkmkiisfj6sk956if2bcj9s0v6n5czn8dxb870vp5nccj3ir") - '("llvm-6.0-DISABLE_ABI_CHECKS" - "014fawd1ba7yckalypfld22zgic87x9nx3cim42zrwygywd36pyg") - '("llvm-6.0-NVPTX-addrspaces" - "1qdi2zmrjsrj0h84zv2vyly2hjcn4f67mfy0s1q353g4v4jkscqc") - '("llvm-D27629-AArch64-large_model_6.0.1" - "1qrshmlqvnasdyc158vfn3hnbigqph3lsq7acb9w8lwkpnnm2j4z") - '("llvm8-D34078-vectorize-fdiv" - "19spqc3xsazn1xs9gpcgv9ldadfkv49rmc5khl7sf1dlmhgi4602") - '("llvm7-D50010-VNCoercion-ni" - "18scg6aa036xa1508s7q93w9dvc5gp69fz6yl6fkh4yffw4gymw6") - '("llvm-8.0-D50167-scev-umin" - "0g9w2x8yryjdkihnrf18x0yi5bi14c5p8wffda1w732dr5ckzk94") - '("llvm-D57118-powerpc" - "0vxz5s0s9b625v1rv8lg1566yhxh1i91ydzmvy5s7njvzc7p19aw") - '("llvm8-WASM-addrspaces" - "1176agj9hh7csdm2lnklb42zcdsb3q6lx9jiyp2shn4p2678y76q") - '("llvm-exegesis-mingw" - "0ph1cj1j7arvf1xq2xcr7qf9g0cpdl14fincgr67vpi520zvd3vp") - '("llvm-test-plugin-mingw" - "12z738cnahbf6n381im7i0hxp1m6k9hrnfjlmq9sac46nxly9gnj") - '("llvm-8.0-D66401-mingw-reloc" - "15v3p5sznn979cfnd7gdn3nd701fd7xd5aks6lnj1mslvljlq3ls") - '("llvm7-revert-D44485" - "0f59kq3p3mpwsbmskypbi4zn01l6ig0x7v2rjp08k2r8z8m6fa8n") - '("llvm-8.0-D63688-wasm-isLocal" - "0i9wi5n63ip3802z6m7aj3p07hkqjlmp4vg4wq3xkf9f6w9rksab") - '("llvm-8.0-D55758-tablegen-cond" - "1l08mg7qigravi7plsq3yzya80fljnp95n8faddr29wbr2qr0655") - '("llvm-8.0-D59389-refactor-wmma" - "0rgrwk4xlwpk7yai2j7xadcfws93rmk2hhh44fysa88imvrbp478") - '("llvm-8.0-D59393-mma-ptx63-fix" - "094jcsxbcx9fljj623mgmc0rjpk12s2rs0di0ck0hakzhr8mbv5n") - '("llvm-8.0-D66657-codegen-degenerate" - "1n1ddx19h90bbpimdyd9dh8fsm6gb93xxyqm4ljkxa1k3cx2vm72") - '("llvm-8.0-D71495-vectorize-freduce" - "1zff08wvji9lnpskk4b3p5zyjsy5hhy23ynxjqlj9dw7jvvfrf0p") - '("llvm-8.0-D75072-SCEV-add-type" - "0amlyyndsc90ml2k6prdahf24q0j23nfmlbqf8gcqcxpl5sqq3i6") - '("llvm-8.0-D65174-limit-merge-stores" - "1ls5114fhgip9rbqabqc16mi367ra0k75ngc1vyqqhq1ghm9x7y9")))))) + (map (match-lambda + ((name hash) + (julia-patch name hash))) + (list + '("llvm-D27629-AArch64-large_model_6.0.1" + "1qrshmlqvnasdyc158vfn3hnbigqph3lsq7acb9w8lwkpnnm2j4z") + '("llvm8-D34078-vectorize-fdiv" + "19spqc3xsazn1xs9gpcgv9ldadfkv49rmc5khl7sf1dlmhgi4602") + '("llvm-7.0-D44650" + "1h55kkmkiisfj6sk956if2bcj9s0v6n5czn8dxb870vp5nccj3ir") + '("llvm9-D50010-VNCoercion-ni" + "1s1d3sjsiq4vxg7ncy5cz56zgy5vcq6ls3iqaiqkvr23wyryqmdx") + '("llvm-exegesis-mingw" + "0ph1cj1j7arvf1xq2xcr7qf9g0cpdl14fincgr67vpi520zvd3vp") + '("llvm-test-plugin-mingw" + "12z738cnahbf6n381im7i0hxp1m6k9hrnfjlmq9sac46nxly9gnj") + '("llvm7-revert-D44485" + "0f59kq3p3mpwsbmskypbi4zn01l6ig0x7v2rjp08k2r8z8m6fa8n") + '("llvm-8.0-D66657-codegen-degenerate" + "1n1ddx19h90bbpimdyd9dh8fsm6gb93xxyqm4ljkxa1k3cx2vm72") + '("llvm-8.0-D71495-vectorize-freduce" + "1zff08wvji9lnpskk4b3p5zyjsy5hhy23ynxjqlj9dw7jvvfrf0p") + '("llvm-D75072-SCEV-add-type" + "029a3fywsm233vf48mscina24idd50dc75wr70lmimrhwnw27p0z") + '("llvm-9.0-D65174-limit-merge-stores" + "04bff1mnblfj9mxfdwr1qdnw3i3szmp60gnhxwas5y68qg33z6j0") + '("llvm9-D71443-PPC-MC-redef-symbol" + "1c93nv7rgc9jg5mqrnvv08xib1789qvlql94fwggh18mp3b9hbgy") + '("llvm-9.0-D78196" + "08a43hyg7yyqjq2vmfsmppf34xcz60wq6y9zw5fdyhw2h1mcnmns") + '("llvm-julia-tsan-custom-as" + "0awh40kf6lm4wn1nsjd1bmhfwq7rqj811szanp2xkpspykw9hg9s") + '("llvm-9.0-D85499" + "0vxlr35srvbvihlgrxq15v6dylp90vgi0qahj22j01jgqmdasjkm")))) + (patch-flags '("-p1")))) (arguments - (substitute-keyword-arguments (package-arguments llvm-8) + (substitute-keyword-arguments (package-arguments llvm-9) ((#:configure-flags flags) `(list ;; Taken from NixOS. Only way I could get libLLVM-6.0.so "-DCMAKE_BUILD_TYPE=Release" @@ -231,7 +221,7 @@ libraries. It is also a bit like @code{ldd} and @code{otool -L}.") (define-public julia (package (name "julia") - (version "1.4.1") + (version "1.5.2") (source (origin (method url-fetch) (uri (string-append @@ -239,7 +229,7 @@ libraries. It is also a bit like @code{ldd} and @code{otool -L}.") version "/julia-" version ".tar.gz")) (sha256 (base32 - "030aza3qj5zcinxbrbqgi7p64q6klwq2bhwccraarx7l0hg9lw3i")) + "08wazf3f1lb2c2c5s700kyak8llfqwki8xlnqyrbwmwxjj801p2n")) (patches (search-patches "julia-SOURCE_DATE_EPOCH-mtime.patch")))) (build-system gnu-build-system) @@ -344,16 +334,6 @@ libraries. It is also a bit like @code{ldd} and @code{otool -L}.") "tests = filter(e->!in(e,[\"backtrace\",\"exceptions\",\"precompile\", \"client\",\"stacktraces\"]), testnames)")) - ;; precompile test is broken, fixed in - ;; fed29f893544d1dc8f86444c65d632c68168d0f3 - (substitute* "test/precompile.jl" - (("@test !isdefined\\(Base.Nothing.name.mt") - "# @test !isdefined(Base.Nothing.name.mt")) - ;; When HOME is not set, julia calls uv_os_homedir, which in - ;; turns call getpwuid_r. Add the HOME env variable to the - ;; external julia call to fix this - (substitute* "test/cmdlineargs.jl" - (("\"JULIA_PROJECT\"") "\"HOME\"=>\"/tmp\", \"JULIA_PROJECT\"")) ;; Marking the test as broken as it's a known bug: ;; https://github.com/JuliaLang/julia/issues/32377 (substitute* "stdlib/REPL/test/replcompletions.jl" @@ -361,11 +341,16 @@ libraries. It is also a bit like @code{ldd} and @code{otool -L}.") ;; Dates has a similar bug: ;; https://github.com/JuliaLang/julia/issues/34655 (substitute* "stdlib/Dates/test/io.jl" + (("\"Dates.Date") "\"Date") (("\"Dates.Time") "\"Time")) ;; Upstream bug I found when packaging ;; https://github.com/JuliaLang/julia/issues/35785 (substitute* "test/file.jl" (("@test dirname\\(t\\) == d") "@test_broken dirname(t) == d")) + ;; Deprecation test fails with --depwarn=no + ;; https://github.com/JuliaLang/julia/issues/37673 + (substitute* "test/Makefile" + (("./runtests.jl") "--depwarn=error ./runtests.jl")) #t)) (add-after 'install 'make-wrapper (lambda* (#:key inputs outputs #:allow-other-keys) @@ -416,7 +401,7 @@ libraries. It is also a bit like @code{ldd} and @code{otool -L}.") (assoc-ref %build-inputs "utf8proc") "/include") "USE_SYSTEM_LLVM=1" - "LLVM_VER=8.0.0" + "LLVM_VER=9.0.1" "USE_LLVM_SHLIB=1" "USE_SYSTEM_LIBUNWIND=1" -- 2.28.0