[bug#50091] [PATCH 18/21] gnu: texlive-bin: Fix building on riscv64-linux.

[Efraim Flashner]

On Tue, Aug 17, 2021 at 01:19:16PM +0300, Efraim Flashner wrote:
> * 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 c00c2ae177..b96aadc357 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?))

I don't think I pushed the patch yet to add target-ppc64le? as an option
yet, but I'll rewrite this one when I do.

> +             '("--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 _
> -- 
> 2.32.0
> 

-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

signature.asc
Description: PGP signature