efraim pushed a commit to branch wip-riscv
in repository guix.
commit f4f89ba2d3d8bc8abed83575fe514cbde237c305
Author: Efraim Flashner <[email protected]>
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 | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 76bce73..f46981f 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -338,13 +338,13 @@ 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 (target-ppc64le?)
+ (target-riscv64?))
+ '("--disable-luajittex"
+ "--disable-luajithbtex"
+ "--disable-mfluajit")
+ '()))
;; Disable tests on some architectures to cope with a failure of
;; luajiterr.test.
@@ -385,7 +385,8 @@ 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-ppc32?)
+ ,@(if (or (target-ppc32?)
+ (target-riscv64?))
;; Some mendex tests fail on some architectures.
`((add-after 'unpack 'skip-mendex-tests
(lambda _
