From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 0LmwOByJyWB2MwEAgWs5BA (envelope-from ) for ; Wed, 16 Jun 2021 07:16:12 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id aD0rNByJyWD1ZgAA1q6Kng (envelope-from ) for ; Wed, 16 Jun 2021 05:16:12 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id F007C1E850 for ; Wed, 16 Jun 2021 07:16:11 +0200 (CEST) Received: from localhost ([::1]:39506 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ltNuM-0008J1-VZ for larch@yhetil.org; Wed, 16 Jun 2021 01:16:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54658) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ltNuF-0008It-Dj for guix-patches@gnu.org; Wed, 16 Jun 2021 01:16:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39661) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ltNuD-0000k4-Tz for guix-patches@gnu.org; Wed, 16 Jun 2021 01:16:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ltNuD-0001G0-Oi for guix-patches@gnu.org; Wed, 16 Jun 2021 01:16:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48325] [PATCH v3b 4/5] julia: Update to 1.6.1: where apply upstream patches? Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 16 Jun 2021 05:16:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48325 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Jean-Baptiste Volatier , 48325@debbugs.gnu.org, Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 48325-submit@debbugs.gnu.org id=B48325.16238205024729 (code B ref 48325); Wed, 16 Jun 2021 05:16:01 +0000 Received: (at 48325) by debbugs.gnu.org; 16 Jun 2021 05:15:02 +0000 Received: from localhost ([127.0.0.1]:51205 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ltNtF-0001Dy-FS for submit@debbugs.gnu.org; Wed, 16 Jun 2021 01:15:01 -0400 Received: from mail-wm1-f43.google.com ([209.85.128.43]:41728) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ltNtD-0001Dk-BP for 48325@debbugs.gnu.org; Wed, 16 Jun 2021 01:14:59 -0400 Received: by mail-wm1-f43.google.com with SMTP id y13-20020a1c4b0d0000b02901c20173e165so931830wma.0 for <48325@debbugs.gnu.org>; Tue, 15 Jun 2021 22:14:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:in-reply-to:references:date:message-id:mime-version :content-transfer-encoding; bh=NZxI3OBcSqfWCT546cio4M9k/hR6CmtHn7qFNdweq+w=; b=eZxFzmC8RYn8RJlzxP7aVC0aw9MDmRRu4d64Sp8snp5qpKhq5kRU/Gp7nvZgtg4B7U wrVJwnSH9/VdxuRm5p0HoDxvMjBxth4Cybqv2pC87KiYKgkoY3+MjvdH4jtRwL5YkA+n Ocufzj17xbGuekpj5xNoXdmRpMio2X5Al4xYBOx2PHguIlcD/3UIaLKLoQhmfbaQExOY +eiKvpgpHpM1cHSK17X/iLrxD4DP+r4ZFfP+kNAp/dV++bvQABX119gWLP5ds4lD1Jxa 570wI5Y5p/X50DRcW3Il0hcR173qfJcLONAUE1mnRPSi6yCDOoBs3F+qkcNZu8933qk2 ekdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:in-reply-to:references:date :message-id:mime-version:content-transfer-encoding; bh=NZxI3OBcSqfWCT546cio4M9k/hR6CmtHn7qFNdweq+w=; b=nt5mdda810z30TkuFCeXEEbTgE8rsm12c25Df7CSQflEZmOFG8QCCwl7tOltPNdMtv zGIm0YpIZkst8/YuFU9GUh+JhNWIHz3c+b7nVd3pQ2HZsSJEyRqGB9ly47nck4LGMh6q HfrcemQ9p0kjdNGpVx5rNza4SVxOnOvIBBgDNlsPpULj1rF3TQVSCsS/MflrAyc+su/8 0F5ivn19IALr+lUCbcnMPJKzAyZ5fi5h+Z9rnKk5s7elGxujyLYQkrO+zHvaTZ6Eg1Zr E63K3a7jYRKWU1SYWoo0ysK1UXN6dXl4KgCG/wdPA8Nuj9Wu9w+BDgVbY8N/eHKyHIw/ xfUQ== X-Gm-Message-State: AOAM533KjWBZ7XDkNLPSoHoKtRI50U2NZtv6jqK+gT2L8DppZQhjYyFF qOmaNz+/lfX/Xt+Gv4Yhm98= X-Google-Smtp-Source: ABdhPJyf+Ymq6ujn+Wf7f6bv8NB7zzF4UwHmQSdyIFmbT6oSdfCeUSzuVKmtge3p5hn6YL7Rab+AcA== X-Received: by 2002:a05:600c:358b:: with SMTP id p11mr2997773wmq.112.1623820493127; Tue, 15 Jun 2021 22:14:53 -0700 (PDT) Received: from lili ([2a01:e0a:59b:9120:65d2:2476:f637:db1e]) by smtp.gmail.com with ESMTPSA id w8sm852287wre.70.2021.06.15.22.14.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Jun 2021 22:14:52 -0700 (PDT) From: zimoun In-Reply-To: References: <20210513140818.10217-1-zimon.toutoune@gmail.com> <87mtsy67rv.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> <87pmx0kn5p.fsf_-_@gnu.org> <87zgw2znuf.fsf@guix.i-did-not-set--mail-host-address--so-tickle-me> Date: Wed, 16 Jun 2021 07:06:11 +0200 Message-ID: <86v96ejt4s.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1623820572; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=NZxI3OBcSqfWCT546cio4M9k/hR6CmtHn7qFNdweq+w=; b=Jx+HVS9JuXth2d24w9w2641FZHioZ9tEV6LxgObVaE5BZK2HbQs9NbdgUUnn4Qn6VSk28e ZzB7OdOivQ2J8OGMdt2HbyQWETD+7wkJRqIeui8gl4aVRPSTqWTSzLM3OS6c55gFtm2EOT p0zD46iR3IzZ6T9u9+pt7WiyNtsis/BSMBIDpyIasQ1MKIBxq1riuhpt8nUUfKsHJFucXq A7CyfOyyIPyDJpDkQ1tJTQDnZ6CpfDEEeLK97oxEXlOZEjUt7fmcCetAItHXCvona+Jk0A VZvjNkSqeCIkgHD966pT5EI2g1tNApu3gNNtGcq2HQFXhGP4SYcvX8+ofTn1KQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1623820572; a=rsa-sha256; cv=none; b=A2vbPDgmnW3hmTC8TdXZq9dNsK8qJujILae+diccpnoN7FY0wfzRgwoZNRLAfgSR/wdfm8 0dfBNwv19c9a01q+p+vqrrAF3OVrGHrNLNXOFsQfzROymR3EzR9t2HYSka/jkmgpdCqObG 1DGigCkP5f73gZlD+EhK3/9DlAohRxE2YbOAw3CCKZrJ3izEjLGkGpyXHCv1b4UuXotcsn lKqmAiXI1fPiwlWZag8Ks+JhNqBE7Hs9oySGpycSiJN0H3COnLuPqTop6ydXO0hCkn+/JF xX77C1ut4QSUzoXN434s9EB/PriXBWwzs/F+lycfxgfF0NHXvrUEI+aoq+6tMA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20161025 header.b=eZxFzmC8; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -0.32 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20161025 header.b=eZxFzmC8; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: F007C1E850 X-Spam-Score: -0.32 X-Migadu-Scanner: scn1.migadu.com X-TUID: DIWAPfFP99Cn Hi Jean-Baptiste, Two comments here: On Sun, 13 Jun 2021 at 20:54, Jean-Baptiste Volatier via Guix-patches via <= guix-patches@gnu.org> wrote: > Subject: [PATCH] DRAFT gnu: julia: Update to 1.6.1. Usually, to ease the review, we increment the reroll count and send all the patch set. Otherwise, one would have to read all the thread to find which patch is the last. Could you send the v4 containing the 5 patches IIRC? > * gnu/packages/julia.scm (julia): Update to 1.6.1. > [arguments]: XXXX > [inputs]: Add nghttp2:lib, Add gfortran:lib, Remove arpack-ng. > [native-inputs]: Add nss-certs. > > Co-Authored-By: Nicol=C3=B2 Balzarotti . > Co-Authored-By: zimoun . > --- > gnu/packages/julia.scm | 353 ++++++++++++++++++++++++++++------------- > 1 file changed, 239 insertions(+), 114 deletions(-) > > diff --git a/gnu/packages/julia.scm b/gnu/packages/julia.scm > index 13c9f7baf1..9903bb009b 100644 > --- a/gnu/packages/julia.scm > +++ b/gnu/packages/julia.scm [...] > (define llvm-julia > (package > - (inherit llvm-9) > + (inherit llvm-11) > (name "llvm-julia") > - (source (origin > - (inherit (package-source llvm-9)) > - ;; Those patches are inside the Julia source repo. > - ;; They are _not_ Julia specific (https://github.com/julia= lang/julia#llvm) > - ;; but they are required to build Julia. > - ;; Discussion: https://bugs.debian.org/cgi-bin/bugreport.c= gi?bug=3D919628 > - (patches > - (map (match-lambda > - ((name hash) > - (julia-patch name hash))) > - (list > - '("llvm-D27629-AArch64-large_model_6.0.1" > - "1qrshmlqvnasdyc158vfn3hnbigqph3lsq7acb9w8lwkpnnm= 2j4z") [...] > - '("llvm-9.0-D85499" > - "0vxlr35srvbvihlgrxq15v6dylp90vgi0qahj22j01jgqmda= sjkm")))) > - (patch-flags '("-p1")))) > (arguments > - (substitute-keyword-arguments (package-arguments llvm-9) > + (substitute-keyword-arguments (package-arguments llvm-11) > ((#:configure-flags flags) > `(list ;; Taken from NixOS. Only way I could get libLLVM-6.0.so > "-DCMAKE_BUILD_TYPE=3DRelease" > @@ -177,7 +141,61 @@ > ;; "-DLLVM_DEFAULT_TARGET_TRIPLE=3D${stdenv.hostPlatform.conf= ig}" > ;; "-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=3DWebAssembly" > "-DLLVM_ENABLE_DUMP=3DON" > - "-DLLVM_LINK_LLVM_DYLIB=3DON")))))) > + "-DLLVM_LINK_LLVM_DYLIB=3DON")) > + ((#:phases phases) > + `(modify-phases ,phases > + ;; applying patches from julia > + ;; list of patches can be found in deps/llvm.mk in julia sour= ce > + (add-after 'unpack 'julia-patches > + (lambda* (#:key inputs outputs #:allow-other-keys) > + (let ((patch > + (lambda (patchname flag) > + (invoke "patch" flag "-i" > + (string-append > + "julia-src/deps/patches/" > + patchname > + ".patch"))))) > + (mkdir-p "julia-src") > + (invoke "tar" "xf" > + (assoc-ref inputs "julia-source") > + "-C" "julia-src" "--strip-components=3D1") > + (map (lambda (patchname) > + (patch patchname "-p1")) > + (list "llvm-D27629-AArch64-large_model_6.0.1" [...] > + "llvm-11-D96283-dagcombine-half")) > + (map (lambda (patchname) > + (patch patchname "-p2")) > + (list "llvm-11-AArch64-FastIsel-bug" > + "llvm-11-D97435-AArch64-movaddrreg" > + "llvm-11-D97571-AArch64-loh" > + "llvm-11-aarch64-addrspace"))))))))) > + (inputs > + `(("julia-source" ,(package-source julia)) > + ,@(package-inputs llvm-11))))) This modification of patch location should appear in the commit message. As I mentioned earlier, I am not convinced it is the right place [1]. I get your point [2] that some are applied with the option =E2=80=9C-p1=E2=80=9D = and other with =E2=80=9C-p2=E2=80=9D. Ludo, any recommendation? 1: 2: All the best, simon PS: I will be offline until the end of next week (~June, 25th).=20