[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
18/21: gnu: texlive-bin: Fix building on riscv64-linux.
From: |
guix-commits |
Subject: |
18/21: gnu: texlive-bin: Fix building on riscv64-linux. |
Date: |
Tue, 17 Aug 2021 03:43:03 -0400 (EDT) |
efraim pushed a commit to branch wip-riscv
in repository guix.
commit fce3042c7a0acd26a32f548cc870a9c353e81457
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 | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index c00c2ae..b96aadc 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,7 +386,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-riscv?))
;; Some mendex tests fail on some architectures.
`((add-after 'unpack 'skip-mendex-tests
(lambda _
- 02/21: gnu: bootstrap: Add support for riscv64-linux., (continued)
- 02/21: gnu: bootstrap: Add support for riscv64-linux., guix-commits, 2021/08/17
- 06/21: gnu: %final-inputs: Add implied gcc:lib input., guix-commits, 2021/08/17
- 10/21: gnu: openssl: Fix build on riscv64-linux., guix-commits, 2021/08/17
- 07/21: gnu: bdb: Fix building on riscv64-linux., guix-commits, 2021/08/17
- 08/21: gnu: elfutils: Fix building on riscv64-linux., guix-commits, 2021/08/17
- 09/21: gnu: pcre: Fix building on riscv64-linux., guix-commits, 2021/08/17
- 11/21: gnu: libtool: Fix building on riscv64-linux., guix-commits, 2021/08/17
- 12/21: gnu: openblas: Fix building on riscv64-linux., guix-commits, 2021/08/17
- 13/21: gnu: mesa: Add support for riscv64-linux., guix-commits, 2021/08/17
- 15/21: gnu: icu4c: Skip tests on riscv64-linux., guix-commits, 2021/08/17
- 18/21: gnu: texlive-bin: Fix building on riscv64-linux.,
guix-commits <=
- 14/21: gnu: pcre2: Fix building on riscv64-linux., guix-commits, 2021/08/17
- 16/21: gnu: openblas-ilp64: Add riscv64-linux as a supported architecture., guix-commits, 2021/08/17
- 17/21: gnu: openlibm: Remove riscv64-linux from supported systems., guix-commits, 2021/08/17
- 19/21: gnu: texlive-updmap.cfg: Update hash., guix-commits, 2021/08/17
- 20/21: gnu: lz4: Build on riscv64-linux without valgrind., guix-commits, 2021/08/17
- 21/21: gnu: lapack: Fix building on riscv64-linux., guix-commits, 2021/08/17