From patchwork Sat Oct 16 19:12:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean-Baptiste Volatier X-Patchwork-Id: 33908 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 E139627BBE3; Sat, 16 Oct 2021 20:13:18 +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_H2,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 9749127BBE1 for ; Sat, 16 Oct 2021 20:13:18 +0100 (BST) Received: from localhost ([::1]:40148 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mbp7N-0001Jp-Jp for patchwork@mira.cbaines.net; Sat, 16 Oct 2021 15:13:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49466) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mbp79-0001Jg-Dz for guix-patches@gnu.org; Sat, 16 Oct 2021 15:13:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59765) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mbp78-0001i0-O2 for guix-patches@gnu.org; Sat, 16 Oct 2021 15:13:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mbp78-0005di-Fs for guix-patches@gnu.org; Sat, 16 Oct 2021 15:13:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#51243] [PATCH] gnu: julia: Fix llvm-julia version Resent-From: Jean-Baptiste Volatier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 16 Oct 2021 19:13:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 51243 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 51243@debbugs.gnu.org Cc: Jean-Baptiste Volatier X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.163441155621642 (code B ref -1); Sat, 16 Oct 2021 19:13:02 +0000 Received: (at submit) by debbugs.gnu.org; 16 Oct 2021 19:12:36 +0000 Received: from localhost ([127.0.0.1]:43078 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mbp6h-0005d0-R8 for submit@debbugs.gnu.org; Sat, 16 Oct 2021 15:12:36 -0400 Received: from lists.gnu.org ([209.51.188.17]:43554) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mbp6g-0005ct-Ji for submit@debbugs.gnu.org; Sat, 16 Oct 2021 15:12:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49418) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mbp6g-0001HW-Cx for guix-patches@gnu.org; Sat, 16 Oct 2021 15:12:34 -0400 Received: from mail-0201.mail-europe.com ([51.77.79.158]:53346) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mbp6e-0001BG-2z for guix-patches@gnu.org; Sat, 16 Oct 2021 15:12:33 -0400 Date: Sat, 16 Oct 2021 19:12:14 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pm.me; s=protonmail; t=1634411539; bh=itgsqos7jUsQpe4bRENFdchf0ETM1ugPelO9+J7EsIM=; h=Date:To:From:Cc:Reply-To:Subject:From; b=cp4WfCB2w6tXWUnJuJyOXETfQwxkbyTwSC17nDw4kXaBncj7T/UIiHg5R9GI9TZrN kPJzKP27l2/i8p8YBsWSTxq2XinnYTdT5XHlfeMagbYG/X59X+YufQ2fdc0hVssU2A giceoUEgoqxULWeb+lELGcifWVVlJgxlNUnxmTTjZlzgYDGmrcGYk+TdM2zvXRodST l4R3UWb1kQXI5s5uHyvjDmlklUubFrg5XF78RgXy8Dc6g5ib6OgiW9re4+pKZeTi25 NOIx4+RVLfYQ2CTHajjXxECpezQoAzrwpnuPoPLfqol82kWwFwHXKtkVsbpk4t6lyd CiLPNvmVtFODA== Message-ID: <20211016191210.3069-1-jbv@pm.me> MIME-Version: 1.0 Received-SPF: pass client-ip=51.77.79.158; envelope-from=jbv@pm.me; helo=mail-0201.mail-europe.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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: Jean-Baptiste Volatier X-ACL-Warn: , Jean-Baptiste Volatier via Guix-patches X-Patchwork-Original-From: Jean-Baptiste Volatier via Guix-patches via From: Jean-Baptiste Volatier X-getmail-retrieved-from-mailbox: Patches LLVM bundled in the binary julia distributed by upstream has its version with a "jl" suffix. The llvm-julia package does not have this suffix, which causes some packages (e. g. LLVM.jl) to fail to load. LLVM.jl does this in order to be sure that it is loading a LLVM as patched for julia and not LLVM from the distribution which will lack the correct patches on distribs other than GUIX. I guess there might be other packages that rely on this, so we should fix our llvm-julia package. * gnu/packages/julia.scm (llvm) [source]: Add missing upstream patch [arguments]: Add configure-flag to set a "jl" suffix to llvm version (julia)[arguments]: Symlink llvm to llvm-11jl.so --- gnu/packages/julia.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) base-commit: 34b0aa16e77bdbb5b847267eb0f825a590e3d101 -- 2.33.1 diff --git a/gnu/packages/julia.scm b/gnu/packages/julia.scm index fe31e545c9..411f2e2e10 100644 --- a/gnu/packages/julia.scm +++ b/gnu/packages/julia.scm @@ -131,6 +131,8 @@ (define llvm-julia "19spqc3xsazn1xs9gpcgv9ldadfkv49rmc5khl7sf1dlmhgi4602") '("llvm-7.0-D44650" "1h55kkmkiisfj6sk956if2bcj9s0v6n5czn8dxb870vp5nccj3ir") + '("llvm7-symver-jlprefix" + "00ng32x6xhm9czczirn5r1q1mc1myad44fqhi061hwh1vb46dwgm") '("llvm-6.0-DISABLE_ABI_CHECKS" "014fawd1ba7yckalypfld22zgic87x9nx3cim42zrwygywd36pyg") '("llvm9-D50010-VNCoercion-ni" @@ -211,7 +213,8 @@ (define llvm-julia ;; "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}" ;; "-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=WebAssembly" "-DLLVM_ENABLE_DUMP=ON" - "-DLLVM_LINK_LLVM_DYLIB=ON")))) + "-DLLVM_LINK_LLVM_DYLIB=ON" + "-DLLVM_VERSION_SUFFIX:STRING=jl")))) (inputs (append (package-inputs llvm-11) @@ -548,7 +551,7 @@ (define-public julia (basename file))))) (find-files (string-append (assoc-ref inputs pkgname) "/lib") pred))))) - (link "llvm" "libLLVM-11\\.so") + (link "llvm" "libLLVM-11jl\\.so") (link "utf8proc" "libutf8proc\\.so") #t))) (add-after 'install 'make-wrapper