From patchwork Thu Mar 31 07:28:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Arun Isaac X-Patchwork-Id: 38240 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 CE51227BBEA; Thu, 31 Mar 2022 08:30:22 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 62A8227BBE9 for ; Thu, 31 Mar 2022 08:30:22 +0100 (BST) Received: from localhost ([::1]:54356 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nZpG9-0006kQ-D7 for patchwork@mira.cbaines.net; Thu, 31 Mar 2022 03:30:21 -0400 Received: from eggs.gnu.org ([209.51.188.92]:46782) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nZpFq-0006jU-KR for guix-patches@gnu.org; Thu, 31 Mar 2022 03:30:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:43747) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nZpFq-00068g-Bc for guix-patches@gnu.org; Thu, 31 Mar 2022 03:30:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nZpFq-0004T5-7j for guix-patches@gnu.org; Thu, 31 Mar 2022 03:30:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54635] [PATCH v2 1/5] gnu: gsl: Force bootstrap when cross-compiling to riscv64-linux. Resent-From: Arun Isaac Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 31 Mar 2022 07:30:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54635 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Efraim Flashner , Maxime Devos Cc: 54635@debbugs.gnu.org, Arun Isaac Received: via spool by 54635-submit@debbugs.gnu.org id=B54635.164871174817037 (code B ref 54635); Thu, 31 Mar 2022 07:30:02 +0000 Received: (at 54635) by debbugs.gnu.org; 31 Mar 2022 07:29:08 +0000 Received: from localhost ([127.0.0.1]:37632 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nZpEv-0004Qc-1d for submit@debbugs.gnu.org; Thu, 31 Mar 2022 03:29:08 -0400 Received: from mugam.systemreboot.net ([139.59.75.54]:51816) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nZpEs-0004QQ-Pp for 54635@debbugs.gnu.org; Thu, 31 Mar 2022 03:29:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=Content-Transfer-Encoding:Content-Type: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=89RmlLIFLrDguICsp52XrOOutjN3JQ9crwx+mZjeVKo=; b=qRKNGNQyjGhl6z4MZAvFJY7INH QvsJOtO7D0x8SnS4hMb3yiJcQ4p5k14lCI80uy5q8rNRhGkAXSfaN6Jsj0rxLySMqfhAvLp18iiSB tQGYPuMa/K84BRlOXWt7PQrnnd/zFdgPg/Pz1hJmO1vqNpSlmkR9nQGdBpMJs3o6Z1tiK3qTGdZKH YNJKO4HGaItjhNCrZptkhfRmcojSmicsUBCNvbmWC9Cwto4K11wovi+G1WGNjMKNzZcIAVCxFHUX/ HZjDJ1BNgZd64z2HNmh0DtKVbihSKcPfU8mf/8EJtX7rN1Thd34v88fjDMgLAj8j1y/Dc/so4vL67 9K/jcaeA==; Received: from [192.168.2.1] (port=47376 helo=localhost.localdomain) by systemreboot.net with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1nZpEh-000V88-E4; Thu, 31 Mar 2022 12:58:51 +0530 From: Arun Isaac Date: Thu, 31 Mar 2022 12:58:45 +0530 Message-Id: <20220331072849.22417-1-arunisaac@systemreboot.net> X-Mailer: git-send-email 2.34.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/maths.scm (gsl)[arguments]: Force autotools bootstrap when cross-compiling to riscv64-linux. [native-inputs]: Add autoconf, automake and libtool when cross-compiling to riscv64-linux. --- gnu/packages/maths.scm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index ecb85642ec..a05f89cb4e 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -19,7 +19,7 @@ ;;; Copyright © 2017 Nikita ;;; Copyright © 2017 Ben Woodcroft ;;; Copyright © 2017 Theodoros Foradis -;;; Copyright © 2017, 2019 Arun Isaac +;;; Copyright © 2017, 2019, 2022 Arun Isaac ;;; Copyright © 2017–2021 Tobias Geerinckx-Rice ;;; Copyright © 2017 Dave Love ;;; Copyright © 2018, 2019, 2020, 2021 Jan (janneke) Nieuwenhuizen @@ -533,6 +533,13 @@ (define-public gsl #:phases (modify-phases %standard-phases ,@(cond + ((target-riscv64?) + '((add-after 'unpack 'force-bootstrap + (lambda _ + ;; gsl ships with an old configure script that does not + ;; support riscv64. Regenerate it. + (delete-file "configure"))))) + ((or (string-prefix? "aarch64" system) (string-prefix? "powerpc" system)) ;; Some sparse matrix tests are failing on AArch64 and PowerPC: @@ -568,6 +575,10 @@ (define-public gsl (string-append "exit (77);\n" all))))))) (else '())))))) + (native-inputs + (if (target-riscv64?) + (list autoconf automake libtool) + '())) (home-page "https://www.gnu.org/software/gsl/") (synopsis "Numerical library for C and C++") (description