From patchwork Fri Aug 20 00:47:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thiago Jung Bauermann X-Patchwork-Id: 32192 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 C1D9C27BC78; Fri, 20 Aug 2021 01:48:08 +0100 (BST) 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_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 59CD727BC6B for ; Fri, 20 Aug 2021 01:48:08 +0100 (BST) Received: from localhost ([::1]:44272 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mGshb-0004Kt-Fg for patchwork@mira.cbaines.net; Thu, 19 Aug 2021 20:48:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48528) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mGshW-0004Kk-5s for guix-patches@gnu.org; Thu, 19 Aug 2021 20:48:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49435) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mGshV-0004V5-Uw for guix-patches@gnu.org; Thu, 19 Aug 2021 20:48:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mGshV-0002yO-Qq for guix-patches@gnu.org; Thu, 19 Aug 2021 20:48:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50081] [PATCH core-updates-frozen v3] gnu: texlive-texmf: Disable LuaJIT engines on powerpc64le References: <20210816194633.7984-1-bauermann@kolabnow.com> In-Reply-To: <20210816194633.7984-1-bauermann@kolabnow.com> Resent-From: Thiago Jung Bauermann Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 20 Aug 2021 00:48:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50081 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50081@debbugs.gnu.org Cc: Mathieu Othacehe , Maxime Devos , Efraim Flashner , Thiago Jung Bauermann Received: via spool by 50081-submit@debbugs.gnu.org id=B50081.162942047111410 (code B ref 50081); Fri, 20 Aug 2021 00:48:01 +0000 Received: (at 50081) by debbugs.gnu.org; 20 Aug 2021 00:47:51 +0000 Received: from localhost ([127.0.0.1]:60981 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mGshK-0002xy-Nb for submit@debbugs.gnu.org; Thu, 19 Aug 2021 20:47:50 -0400 Received: from mx.kolabnow.com ([95.128.36.40]:14184) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mGshI-0002xl-Tx for 50081@debbugs.gnu.org; Thu, 19 Aug 2021 20:47:49 -0400 Received: from localhost (unknown [127.0.0.1]) by ext-mx-out003.mykolab.com (Postfix) with ESMTP id 0F3CA40C0B; Fri, 20 Aug 2021 02:47:43 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kolabnow.com; h= content-transfer-encoding:content-type:content-type:mime-version :message-id:date:date:subject:subject:from:from:received :received:received; s=dkim20160331; t=1629420458; x=1631234859; bh=0CjhxaKsa+kkfJ47X27KVl3Z3gjWTFh4zp6WS7DtYso=; b=tymoHlx+LLzg d/X2tMlsfg69Awl3gha5Zzipoi1lgv5m2WieS/YSpeXlnX6rr1nPaGKNjS5Mgh05 mQjqe+fjbdDOaFpuyI2lsvi7/+GxDoQNkRdyp6rslKDI4uQacgtKCzYiQQedFRsV gnr1ARD+guWejuONo5RrfyihEikhlAVFowOkjUX8UEQnGZoEbusVywAuFCaFBotb BAwN7EmLXzIMrn6BvemhqOIube6AQoWZsuKxMvcjA/s1Z/CZUXMMW3g5BK3SsrZe bsbVTUjiL4XR+9kRVVtm5fYvPcFvoNr7fzEl39aojx0kcCtxPNxTgtsBq1gtdp3i 9sa38ikVGZx+EV2eG+uyP/qnyqwIsqu6ru2ujpeWFKHxPX0x7VI8YPYkhB061EEv tBnC5zVTt3/DrpAk0cPujTGVzytqD0ivRL3uRGCuhqNMNaLRciOhgdFG/yV0oiev 0Uf8ExgJ8vTkdUmf+aTDT4iz7NgswMD/WqIEwyyMAXkrE2Hc64nHtWiuwOoUKaJv O8yDln6qMeX5DxsjjzcULDSQf4D3EhFZtfJXG1/CNAVpArVu+04ewZAu9s7MYVGi 9/ezVXN6iEf747pRTMj62aWiMZxnGXwg59QnQT29NXGnYDZxz4avHbJXtzcASEru Z+sOQWnhWwDyub6vDLaTlX7c9np6loY= X-Virus-Scanned: amavisd-new at mykolab.com Received: from mx.kolabnow.com ([127.0.0.1]) by localhost (ext-mx-out003.mykolab.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id WizeRnbhWe4D; Fri, 20 Aug 2021 02:47:38 +0200 (CEST) Received: from int-mx003.mykolab.com (unknown [10.9.13.3]) by ext-mx-out003.mykolab.com (Postfix) with ESMTPS id 5DBD740C09; Fri, 20 Aug 2021 02:47:38 +0200 (CEST) Received: from ext-subm003.mykolab.com (unknown [10.9.6.3]) by int-mx003.mykolab.com (Postfix) with ESMTPS id 0FE7F4F87; Fri, 20 Aug 2021 02:47:34 +0200 (CEST) Date: Thu, 19 Aug 2021 21:47:15 -0300 Message-Id: <20210820004715.21077-1-bauermann@kolabnow.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" Reply-to: Thiago Jung Bauermann X-ACL-Warn: , Thiago Jung Bauermann via Guix-patches X-Patchwork-Original-From: Thiago Jung Bauermann via Guix-patches via From: Thiago Jung Bauermann X-getmail-retrieved-from-mailbox: Patches LuaJIT isn’t ported to 64-bit PowerPC. ‘texlive-bin’ and ‘texlive-latex-base’ already disable the engines that rely on it, so just do the same in texlive-texmf. Fix suggested by Mathieu Othacehe . Also, for consistency use ‘target-ppc64le’ in ‘texlive-bin’ as well. * gnu/packages/tex.scm (texlive-bin)[arguments]<#:configure-flags>: Use ‘target-ppc64le’. (texlive-texmf)[arguments]<#:phases>{texmf-config}: Disable LuaJIT engines when building for powerpc64le. --- Hello, This fixes the build of ‘texlive-texmf’ on powerpc64le. It was failing with these errors: fmtutil [ERROR]: not building luajittex due to missing engine: luajittex fmtutil [ERROR]: not building luajithbtex due to missing engine: luajithbtex Thank you very much to Mathieu for his help in making this work. Changes since v2: - Use ‘target-ppc64le?’ to match target string. - Change ‘texlive-bin’ to also use ‘target-ppc64le?’. Changes since v1: - Match target with “powerpc64” prefix rather than “powerpc64le”. gnu/packages/tex.scm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 4500f1929264..9ec015482808 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -339,8 +339,7 @@ files from LOCATIONS with expected checksum HASH. CODE is not currently in use. "--with-system-zlib" "--with-system-zziplib" ;; LuaJIT is not ported to powerpc64le* yet. - ,@(if (string-prefix? "powerpc64le" (or (%current-target-system) - (%current-system))) + ,@(if (target-ppc64le?) '("--disable-luajittex" "--disable-luajithbtex" "--disable-mfluajit") @@ -6829,9 +6828,15 @@ directly generate PDF documents instead of DVI.") (share (string-append out "/share")) (texmfroot (string-append share "/texmf-dist/web2c")) (texmfcnf (string-append texmfroot "/texmf.cnf")) + (fmtutilcnf (string-append texmfroot "/fmtutil.cnf")) (texlive-bin (assoc-ref inputs "texlive-bin")) (texbin (string-append texlive-bin "/bin")) (tlpkg (string-append texlive-bin "/share/tlpkg"))) + ;; LuaJIT is not ported to powerpc64* yet. + (if ,(target-ppc64le?) + (substitute* fmtutilcnf + (("^(luajittex|luajithbtex|mfluajit)" m) + (string-append "#! " m)))) ;; Register SHARE as TEXMFROOT in texmf.cnf. (substitute* texmfcnf (("TEXMFROOT = \\$SELFAUTOPARENT")