GNU bug report logs - #52186
[core-updates-frozen] [PATCH] gnu: libunwind-julia: Fix build on i686-linux.

Previous Next

Full log

View this message in rfc822 format

From: zimoun <zimon.toutoune <at> gmail.com>
To: 52186 <at> debbugs.gnu.org
Cc: efraim <at> flashner.co.il, maxim.cournoyer <at> gmail.com, zimoun <zimon.toutoune <at> gmail.com>
Subject: [bug#52186] [core-updates-frozen PATCH v2 05/17] gnu: julia-configurations: Fix tests on i686-linux.
Date: Wed,  1 Dec 2021 16:53:51 +0100

* gnu/packages/julia-xyz.scm (julia-configurations)[arguments]<#:phases>:
Conditionally replace the incorrect type in test suite.
---
 gnu/packages/julia-xyz.scm | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm
index f5d2f69997..d673045033 100644
--- a/gnu/packages/julia-xyz.scm
+++ b/gnu/packages/julia-xyz.scm
@@ -804,8 +804,7 @@ (define-public julia-configurations
          (add-after 'link-depot 'fix-tests
            (lambda _
              (substitute* "test/runtests.jl"
-               (("option.toml") "test/option.toml"))
-             #t))
+               (("option.toml") "test/option.toml"))))
          (add-after 'link-depot 'dont-use-exproniconlite
            (lambda _
              (substitute* '("Project.toml"
@@ -814,8 +813,14 @@ (define-public julia-configurations
                (("ExproniconLite") "Expronicon"))
              (substitute* "Project.toml"
                (("55351af7-c7e9-48d6-89ff-24e801d99491")
-                "6b7a57c9-7cc1-4fdf-b7f5-e857abae3636"))
-             #t)))))
+                "6b7a57c9-7cc1-4fdf-b7f5-e857abae3636"))))
+         ,@(if (string-prefix? "i686" (or (%current-target-system)
+                                          (%current-system)))
+               '((add-after 'unpack 'fix-tests-int32-i686
+                   (lambda _
+                     (substitute* "test/runtests.jl"
+                       (("Int64") "Int32")))))
+               '()))))
     (propagated-inputs
      `(("julia-crayons" ,julia-crayons)
        ("julia-expronicon" ,julia-expronicon)
-- 
2.32.0

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.