From patchwork Tue Mar 16 06:45:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Christopher Marusich X-Patchwork-Id: 27873 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id AEBAA27BC55; Tue, 16 Mar 2021 06:48:54 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id BF9F427BC52 for ; Tue, 16 Mar 2021 06:48:53 +0000 (GMT) Received: from localhost ([::1]:56492 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lM3Vc-0003v4-Vd for patchwork@mira.cbaines.net; Tue, 16 Mar 2021 02:48:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49556) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lM3Ur-00039C-Du for guix-patches@gnu.org; Tue, 16 Mar 2021 02:48:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54624) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lM3Ur-0005ZV-3l for guix-patches@gnu.org; Tue, 16 Mar 2021 02:48:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lM3Ur-0001fp-2a for guix-patches@gnu.org; Tue, 16 Mar 2021 02:48:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47182] [PATCH 10/18] gnu: texlive-bin: Fix compilation on powerpc64le*. Resent-From: Chris Marusich Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 16 Mar 2021 06:48:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47182 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47182@debbugs.gnu.org Cc: Leo Le Bouter , Chris Marusich Received: via spool by 47182-submit@debbugs.gnu.org id=B47182.16158772386260 (code B ref 47182); Tue, 16 Mar 2021 06:48:05 +0000 Received: (at 47182) by debbugs.gnu.org; 16 Mar 2021 06:47:18 +0000 Received: from localhost ([127.0.0.1]:37914 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lM3U6-0001cs-54 for submit@debbugs.gnu.org; Tue, 16 Mar 2021 02:47:18 -0400 Received: from mail-pl1-f175.google.com ([209.85.214.175]:43910) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lM3Tt-0001Zk-Ez for 47182@debbugs.gnu.org; Tue, 16 Mar 2021 02:47:06 -0400 Received: by mail-pl1-f175.google.com with SMTP id f8so2969782plg.10 for <47182@debbugs.gnu.org>; Mon, 15 Mar 2021 23:47:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4yCwNDAQfkELzzqXrDQLFxmaYLrLLDdntwljT/Tlfp8=; b=QvOt65H6d9KvcllEaZkePIylGyRMHQ6F4CaPi13bB/eXLtSs1QaQBB48cNQ8vhNQ0Z /lCbAVRlOsK6cdq6XkfsYREDM91gaAm3IWQHpEDbdcAcTF+TytbzGE2LMpDbh4xxheOt e7O6FKVwq4i9S1E1K9JaRKWHXva0WQex3LVndVJ0D0YY4hhPH/YK83JXAeGQEi6HoWC7 IgeDhyKQ8WFZFn5tln6a2ZbQZZNeFlVvUUc661nhGOM1wMhjhRdv8TENV3AfsDGsipUp BJVmagXdR0sqjLNWtaJu60I8O78uyLiToAx1i0IHYXdiG3nq8vzlCjgZBc8pwXyUH2bV 6KoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4yCwNDAQfkELzzqXrDQLFxmaYLrLLDdntwljT/Tlfp8=; b=d9OdgPbiGeY2mit3/EU7sqE5Vm1RB+NrKQsi3FXVRXbuZ6lej/SVnUZ0fvmihAqEO2 yGIPoP1w7jt++p8xbP81E8hjAgg+wJW9o2/Dw75EGRnB7lLtIn0FPrjUjsVB0+tyet0/ c33mPcaw1DCvTogZT3saKAb0J+9348EMqbMW9OA8QGIvD/hMmHcnsZ1CLWceLiDbIoEZ zfyKJwLveK+ei05u+tJyev+T8C/PNSyMDo0yB/whYEqoMByiLpk4jNpvgyUcvlnQj0ng k4fuDkFzZnjsbEu/TLX55+9I14FxY0cDhIa22bz91fHzve+i+h64ZtE18xg2SWhoVShR b7Pw== X-Gm-Message-State: AOAM531S5rhkKwT8YxBjfGDKDTvGdDjww6UVRySuPOCb3CX6WOl2A/MO tLqBnwzylIY0ACmvn3QJru5/+36PfcO0ag== X-Google-Smtp-Source: ABdhPJzqcgBHuRUqfjFho+KrRmOtgcrDt+f6E6s7Fs+d6NXR0PfIzrF1i12B6qMx0FtvDBRMNbfcjw== X-Received: by 2002:a17:90a:1a59:: with SMTP id 25mr3335904pjl.54.1615877219395; Mon, 15 Mar 2021 23:46:59 -0700 (PDT) Received: from garuda-lan.lan (c-24-18-44-142.hsd1.wa.comcast.net. [24.18.44.142]) by smtp.gmail.com with ESMTPSA id r186sm15541160pfr.124.2021.03.15.23.46.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Mar 2021 23:46:58 -0700 (PDT) From: Chris Marusich Date: Mon, 15 Mar 2021 23:45:03 -0700 Message-Id: <20210316064511.2891553-10-cmmarusich@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210316064511.2891553-1-cmmarusich@gmail.com> References: <20210316062805.2890883-1-cmmarusich@gmail.com> <20210316064511.2891553-1-cmmarusich@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches From: Leo Le Bouter * 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 --- 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 ;;; Copyright © 2020, 2021 Paul Garlick ;;; Copyright © 2021 Maxim Cournoyer +;;; Copyright © 2021 Leo Le Bouter ;;; ;;; 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