From patchwork Tue Aug 17 10:19:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 32160 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 0F6B727BC78; Tue, 17 Aug 2021 11:31:35 +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.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS 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 D5E1A27BC6B for ; Tue, 17 Aug 2021 11:31:34 +0100 (BST) Received: from localhost ([::1]:35458 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mFwNZ-0007IA-UJ for patchwork@mira.cbaines.net; Tue, 17 Aug 2021 06:31:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54780) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mFwN6-0007Ha-69 for guix-patches@gnu.org; Tue, 17 Aug 2021 06:31:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40319) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mFwN4-00036D-VY for guix-patches@gnu.org; Tue, 17 Aug 2021 06:31:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mFwN4-0004Ui-Sl for guix-patches@gnu.org; Tue, 17 Aug 2021 06:31:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50091] [PATCH 18/21] gnu: texlive-bin: Fix building on riscv64-linux. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 17 Aug 2021 10:31:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50091 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50091@debbugs.gnu.org Cc: Efraim Flashner Received: via spool by 50091-submit@debbugs.gnu.org id=B50091.162919625517250 (code B ref 50091); Tue, 17 Aug 2021 10:31:02 +0000 Received: (at 50091) by debbugs.gnu.org; 17 Aug 2021 10:30:55 +0000 Received: from localhost ([127.0.0.1]:51863 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mFwMw-0004UA-Rj for submit@debbugs.gnu.org; Tue, 17 Aug 2021 06:30:55 -0400 Received: from flashner.co.il ([178.62.234.194]:45982) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mFwMv-0004Tp-GH for 50091@debbugs.gnu.org; Tue, 17 Aug 2021 06:30:53 -0400 Received: from localhost (unknown [141.226.169.107]) by flashner.co.il (Postfix) with ESMTPSA id BE872402E0; Tue, 17 Aug 2021 10:30:47 +0000 (UTC) From: Efraim Flashner Date: Tue, 17 Aug 2021 13:19:16 +0300 Message-Id: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: 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 * 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?)) + '("--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 _