guix-commits
[Top][All Lists]
Advanced

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

10/18: gnu: texlive-bin: Fix compilation on powerpc64le*.


From: guix-commits
Subject: 10/18: gnu: texlive-bin: Fix compilation on powerpc64le*.
Date: Wed, 24 Mar 2021 02:25:12 -0400 (EDT)

marusich pushed a commit to branch master
in repository guix.

commit e9938dc8f0e081e4407a96502a04ea63f07e5a8c
Author: Leo Le Bouter <lle-bout@zaclys.net>
AuthorDate: Mon Feb 8 03:13:53 2021 +0100

    gnu: texlive-bin: Fix compilation on powerpc64le*.
    
    * 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 c0f4ff0..508537a 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))))
+
       #:phases
       (modify-phases %standard-phases
         (add-after 'unpack 'configure-ghostscript-executable



reply via email to

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