03/16: gnu: julia: Make libquadmath optional.

[guix-commits]

efraim pushed a commit to branch master
in repository guix.

commit 7d8f92dd87e6f13ec6b87744c3db9bb3be541707
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Thu Dec 8 10:21:13 2022 +0200

    gnu: julia: Make libquadmath optional.
    
    * gnu/packages/julia.scm (julia)[arguments]: Replace custom phase
    removing libquadmath requirement for aarch64-linux with phase to make
    libquadmath support optional.
---
 gnu/packages/julia.scm | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/julia.scm b/gnu/packages/julia.scm
index 5e6d188ec4..75a38c016e 100644
--- a/gnu/packages/julia.scm
+++ b/gnu/packages/julia.scm
@@ -221,18 +221,12 @@ libraries.  It is also a bit like @code{ldd} and 
@code{otool -L}.")
              ;; causing the build to fail prematurely.
              (substitute* "contrib/generate_precompile.jl"
                (("1200") "1100"))))
-         ;; For some reason libquadmath is unavailable on this architecture.
+         ;; libquadmath is not available on all architectures.
          ;; https://github.com/JuliaLang/julia/issues/41613
-         ,@(if (target-aarch64?)
-             '((add-after 'unpack 'drop-libquadmath-on-aarch64
-                 (lambda _
-                   (substitute* '("contrib/fixup-libgfortran.sh"
-                                  "deps/csl.mk"
-                                  "base/Makefile")
-                     ((".*libquadmath.*") ""))
-                   (substitute* "Makefile"
-                     (("libquadmath ") "")))))
-             '())
+         (add-after 'unpack 'make-libquadmath-optional
+           (lambda _
+             (substitute* "base/Makefile"
+               (("libquadmath,0") "libquadmath,0,ALLOW_FAILURE"))))
          (add-before 'check 'set-home
            ;; Some tests require a home directory to be set.
            (lambda _ (setenv "HOME" "/tmp")))