guix-patches
[Top][All Lists]
Advanced

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

[bug#47182] [PATCH 10/18] gnu: texlive-bin: Fix compilation on powerpc64


From: Efraim Flashner
Subject: [bug#47182] [PATCH 10/18] gnu: texlive-bin: Fix compilation on powerpc64le*.
Date: Tue, 16 Mar 2021 09:53:11 +0200

On Mon, Mar 15, 2021 at 11:45:03PM -0700, Chris Marusich wrote:
> From: Leo Le Bouter <lle-bout@zaclys.net>
> 
> * gnu/packages/tex.scm (texlive-bin)[arguments]: Append "--disable-luajittex"
> and "--disable-mfluajit" to keyword argument "#:configure-flags" on
> powerpc64le* because LuaJIT is not ported to powerpc64le* yet. Also set
> "#:tests?" to "#f" on powerpc64le*.
> 
> Signed-off-by: Chris Marusich <cmmarusich@gmail.com>
> ---
>  gnu/packages/tex.scm | 20 +++++++++++++++-----
>  1 file changed, 15 insertions(+), 5 deletions(-)
> 
> diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
> index c0f4ff0fcdc..508537acdaf 100644
> --- a/gnu/packages/tex.scm
> +++ b/gnu/packages/tex.scm
> @@ -15,6 +15,7 @@
>  ;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
>  ;;; Copyright © 2020, 2021 Paul Garlick <pgarlick@tourbillion-technology.com>
>  ;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
> +;;; Copyright © 2021 Leo Le Bouter <lle-bout@zaclys.net>
>  ;;;
>  ;;; This file is part of GNU Guix.
>  ;;;
> @@ -342,14 +343,23 @@ files from LOCATIONS with expected checksum HASH.  CODE 
> is not currently in use.
>           "--with-system-teckit"
>           "--with-system-xpdf"
>           "--with-system-zlib"
> -         "--with-system-zziplib")
> -
> -      ;; Disable tests on mips64/aarch64 to cope with a failure of 
> luajiterr.test.
> -      ;; XXX FIXME fix luajit properly on mips64 and aarch64.
> +         "--with-system-zziplib"
> +         ;; LuaJIT is not ported to powerpc64le* yet.
> +         ,@(if (string-prefix? "powerpc64le" (or (%current-target-system)
> +                                                 (%current-system)))
> +               '("--disable-luajittex"
> +                 "--disable-mfluajit")
> +               '()))
> +
> +      ;; Disable tests on some architectures to cope with a failure of
> +      ;; luajiterr.test.
> +      ;; XXX FIXME fix luajit properly on these architectures.
>        #:tests? ,(let ((s (or (%current-target-system)
>                               (%current-system))))
>                    (not (or (string-prefix? "aarch64" s)
> -                           (string-prefix? "mips64" s))))
> +                           (string-prefix? "mips64" s)
> +                           (string-prefix? "powerpc64le" s))))
> +

we can probably change this to use cute in core-updates. I don't know if
changing it here will cause rebuilds on aarch64.

>        #:phases
>        (modify-phases %standard-phases
>          (add-after 'unpack 'configure-ghostscript-executable
> -- 
> 2.26.2
> 
> 
> 
> 

-- 
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

Attachment: signature.asc
Description: PGP signature


reply via email to

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