guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/04: gnu: texlive-bin: Fix building on riscv64-linux.


From: guix-commits
Subject: 01/04: gnu: texlive-bin: Fix building on riscv64-linux.
Date: Tue, 17 Aug 2021 03:03:04 -0400 (EDT)

efraim pushed a commit to branch wip-riscv
in repository guix.

commit fada4a50c449229b10942858b9ca168c099a7315
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Tue Aug 17 09:52:22 2021 +0300

    gnu: texlive-bin: Fix building on riscv64-linux.
    
    * gnu/packages/tex.scm (texlive-bin)[arguments]: Adjust configure-flags
    for riscv64-linux to skip luajit based binaries. Add phase to skip some
    tests.
---
 gnu/packages/tex.scm | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 7016694..6c86c96 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -338,13 +338,14 @@ files from LOCATIONS with expected checksum HASH.  CODE 
is not currently in use.
          "--with-system-teckit"
          "--with-system-zlib"
          "--with-system-zziplib"
-         ;; LuaJIT is not ported to powerpc64le* yet.
-         ,@(if (string-prefix? "powerpc64le" (or (%current-target-system)
-                                                 (%current-system)))
-               '("--disable-luajittex"
-                 "--disable-luajithbtex"
-                 "--disable-mfluajit")
-               '()))
+         ;; LuaJIT is not ported to some architectures yet.
+         ,@(if (or (string-prefix? "powerpc64le" (or (%current-target-system)
+                                                     (%current-system)))
+                   (target-riscv?))
+             '("--disable-luajittex"
+               "--disable-luajithbtex"
+               "--disable-mfluajit")
+             '()))
 
       ;; Disable tests on some architectures to cope with a failure of
       ;; luajiterr.test.
@@ -385,6 +386,15 @@ files from LOCATIONS with expected checksum HASH.  CODE is 
not currently in use.
                (("^\\./omfonts -ofm2opl \\$srcdir/tests/check tests/xcheck 
\\|\\| exit 1")
                 "./omfonts -ofm2opl $srcdir/tests/check tests/xcheck || exit 
77"))
              #t))
+         ,@(if (target-riscv?)
+             ;; Some mendex tests fail on some architectures.
+             `((add-after 'unpack 'skip-mendex-tests
+                 (lambda _
+                   (substitute* '("texk/mendexk/tests/mendex.test"
+                                  "texk/upmendex/tests/upmendex.test")
+                     (("srcdir/tests/pprecA-0.ind pprecA-0.ind1 \\|\\| exit 1")
+                      "srcdir/tests/pprecA-0.ind pprecA-0.ind1 || exit 77")))))
+             '())
          (add-after 'unpack 'unpack-texlive-extra
            (lambda* (#:key inputs #:allow-other-keys)
              (mkdir "texlive-extra")



reply via email to

[Prev in Thread] Current Thread [Next in Thread]