From patchwork Tue Mar 23 19:46:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 28060 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 9145127BC5C; Tue, 23 Mar 2021 19:58:43 +0000 (GMT) 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_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS, 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 1FCFB27BC59 for ; Tue, 23 Mar 2021 19:58:43 +0000 (GMT) Received: from localhost ([::1]:41980 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lOnAo-0006a0-6C for patchwork@mira.cbaines.net; Tue, 23 Mar 2021 15:58:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38746) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOn0V-0002kk-E0 for guix-patches@gnu.org; Tue, 23 Mar 2021 15:48:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49837) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lOn0U-0003Uk-Q6 for guix-patches@gnu.org; Tue, 23 Mar 2021 15:48:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lOn0U-0008HI-OW for guix-patches@gnu.org; Tue, 23 Mar 2021 15:48:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47350] [PATCH 22/29] gnu: Add julia-compilersupportlibraries-jll. Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 23 Mar 2021 19:48:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47350 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47350@debbugs.gnu.org Cc: zimoun Received: via spool by 47350-submit@debbugs.gnu.org id=B47350.161652884331706 (code B ref 47350); Tue, 23 Mar 2021 19:48:02 +0000 Received: (at 47350) by debbugs.gnu.org; 23 Mar 2021 19:47:23 +0000 Received: from localhost ([127.0.0.1]:33134 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lOmzq-0008FE-Nz for submit@debbugs.gnu.org; Tue, 23 Mar 2021 15:47:22 -0400 Received: from mail-wm1-f42.google.com ([209.85.128.42]:52761) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lOmzf-0008Co-RE for 47350@debbugs.gnu.org; Tue, 23 Mar 2021 15:47:12 -0400 Received: by mail-wm1-f42.google.com with SMTP id d191so11714669wmd.2 for <47350@debbugs.gnu.org>; Tue, 23 Mar 2021 12:47:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0SZQDaD3P2I8ADuZuH0tF7ykXWA5q2zkjdEHF3ugsak=; b=pIWD3CKvzQ4DoGJzbVeI8O99bO6upFuIT+PUSJIiEO5+xw7BSFjuG8YdZNK2wv9TfD X9f/otGLD5EzkSZW94zS8+EhzIX+Jxnv0gP2D1Klyz3juuriOMOZIA12tVhr3WEHOntq NIKRdVpFcFcvrLaBkTUZ+zADy9VfDXuDh1BTxd9a4cxEh1U4O0ZZe1BzCg//3NxLJSfT 1nPu8Nf9GBRRIivMebVe2PyHhCVjUYG8ScP4VbaE5lrhN74AV011iymKext3y+C8T9DV YDFBYeNx6cbcv2jMwtm4i0KeVBDC3nl8NZyTusARfJPCllAzBU2c8/UeIeXZTCk62ACE aEag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=0SZQDaD3P2I8ADuZuH0tF7ykXWA5q2zkjdEHF3ugsak=; b=EQs8dTvNACsN6Hu8NjvYXKNgB36hHlPgNLX3rGJFKCadby9d+xp3KnoydQmkPv0+C+ 7lPPE6sLWAKRtumWQKV0fomfk+ouXdhjrk+116nlKGDmZqHBGaptslyyOVYWk/ejLln8 uCZ44W8ioBM6cmsI91m/zGEdnqvrV+r38WYqP3DVcsYFxLblNDgCbj59E/yMMWlpS1JT w9eXUVqpCWKqa69LNmnepo7KYRvP5H/eeO+cscPI7mlGxqqgvTjIE3lvPFVIxZvoejNX me5ZNMSV3IddRLr79AUbSZUgX0M2QQtNBaubsLlnpPoIZDpEX8Lw8IB9uwcHSnkxEEMW joRw== X-Gm-Message-State: AOAM532qy6vSP1XA7RXSxdend7TwK+3yLZJgGxQt1+o7Xdf40wC7O3SX uZ3RlzCunxQkxE3c9DI1tsfqJXrXsHs= X-Google-Smtp-Source: ABdhPJypo/ryjeLw/Z+KuveFAhHiH3OrH+pU6OyqJL0aoW+ZHgL4vIyIzyWuF8LQ+Cszap7fQxtoMw== X-Received: by 2002:a1c:b48a:: with SMTP id d132mr4668418wmf.108.1616528826300; Tue, 23 Mar 2021 12:47:06 -0700 (PDT) Received: from pfiuh02.univ-paris-diderot.fr ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id a131sm3656104wmc.48.2021.03.23.12.47.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Mar 2021 12:47:06 -0700 (PDT) From: zimoun Date: Tue, 23 Mar 2021 20:46:49 +0100 Message-Id: <20210323194656.18303-3-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20210323194656.18303-1-zimon.toutoune@gmail.com> References: <20210323194656.18303-1-zimon.toutoune@gmail.com> MIME-Version: 1.0 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/julia-xyz.scm (julia-compilersupportlibraries-jll): New variable. --- gnu/packages/julia-xyz.scm | 44 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index e22e91bc78..02466fcd04 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -22,6 +22,7 @@ #:use-module (guix packages) #:use-module (guix git-download) #:use-module (guix build-system julia) + #:use-module (gnu packages gcc) #:use-module (gnu packages tls)) (define-public julia-abstractffts @@ -312,6 +313,49 @@ provides a macro that lets you use the latest syntax in a backwards-compatible way.") (license license:expat))) +;;; TODO: Remove this autogenerated source package +;;; and build it from realse source using +(define-public julia-compilersupportlibraries-jll + (package + (name "julia-compilersupportlibraries-jll") + (version "0.4.0+1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/JuliaBinaryWrappers/CompilerSupportLibraries_jll.jl") + (commit (string-append "CompilerSupportLibraries-v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "03j6xdvps259mhdzpjqf41l65w2l9sahvxg4wrp34hcf69wkrzpy")))) + (build-system julia-build-system) + (arguments + `(#:tests? #f ; no runtests.jl + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'override-binary-path + (lambda* (#:key inputs #:allow-other-keys) + (map + (lambda (wrapper) + (substitute* wrapper + (("generate_wrapper_header.*") + (string-append + "generate_wrapper_header(\"CompilerSupportLibraries\", \"" + (assoc-ref inputs "gfortran:lib") "\")\n")))) + ;; There's a Julia file for each platform, override them all + (find-files "src/wrappers/" "\\.jl$")) + #t))))) + (inputs ;required by artifacts + `(("gfortran:lib" ,gfortran "lib"))) + (propagated-inputs + `(("julia-jllwrappers" ,julia-jllwrappers))) + (home-page "https://github.com/JuliaBinaryWrappers/CompilerSupportLibraries_jll.jl") + (synopsis "Internal wrappers") + (description "This package is an autogenerated source package constructed +using @code{BinaryBuilder.jl}. The originating @code{build_tarballs.jl} script +can be found on the community build tree Yggdrasil.") + (license license:expat))) + (define-public julia-constructionbase (let ((commit "de77e2865b554f9b078fd8c35b593cce0554ae02")) (package