From patchwork Wed Mar 30 09:23:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Arun Isaac X-Patchwork-Id: 38214 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 1ADC127BBE9; Wed, 30 Mar 2022 10:24:53 +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 3218727BBEC for ; Wed, 30 Mar 2022 10:24:50 +0100 (BST) Received: from localhost ([::1]:57706 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nZUZN-0007sU-Ae for patchwork@mira.cbaines.net; Wed, 30 Mar 2022 05:24:49 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56640) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nZUYc-0007pX-DI for guix-patches@gnu.org; Wed, 30 Mar 2022 05:24:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40609) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nZUYc-0000Ss-3o for guix-patches@gnu.org; Wed, 30 Mar 2022 05:24:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nZUYc-00013n-0i for guix-patches@gnu.org; Wed, 30 Mar 2022 05:24:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54635] [PATCH 1/5] gnu: gsl: Force bootstrap when cross-compiling to riscv64-linux. References: <20220330091913.23206-1-arunisaac@systemreboot.net> In-Reply-To: <20220330091913.23206-1-arunisaac@systemreboot.net> Resent-From: Arun Isaac Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 30 Mar 2022 09:24:01 +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: 54635@debbugs.gnu.org Cc: Arun Isaac , Efraim Flashner Received: via spool by 54635-submit@debbugs.gnu.org id=B54635.16486322033990 (code B ref 54635); Wed, 30 Mar 2022 09:24:01 +0000 Received: (at 54635) by debbugs.gnu.org; 30 Mar 2022 09:23:23 +0000 Received: from localhost ([127.0.0.1]:34496 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nZUXw-00011r-6X for submit@debbugs.gnu.org; Wed, 30 Mar 2022 05:23:23 -0400 Received: from mugam.systemreboot.net ([139.59.75.54]:51802) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nZUXt-00011b-KQ for 54635@debbugs.gnu.org; Wed, 30 Mar 2022 05:23:19 -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: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:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=zMvabFjZY3Am0dZy4NS03MJ1hvRlema0+m2EfOMj0sI=; b=Lu0MTK2V9WI47prLhspTlH/iw4 KFUMhwyG07zhY8KFCIfaQ9Nk7eJY4U2CmmO4V3KIyT5hKc4Wirqz9cgxm3NSVYsjPMP5m11T/GVB4 nkNu7qQqp2Hrjn3bw9nj69FAZE8yAGPSsjYZCKQyun+WbvCk9SeG2ip0XAKhOITHh6sOwbxyFZPrz FRFhMaHSHKkXahoAdT1JOJDu+jYwG0MbkXM/HefRSncEYTzNDAfLTx/09yqcH+YCMkppTem0RAdmy kgm5WeCxRboXFFKnRGUT8EAQsGkQRUL+9+dItMtJcK9o/etefcfjxS2y4kbwFjp7nlk4di7pdeIx1 Al2KDaSw==; Received: from [192.168.2.1] (port=6582 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 1nZUXq-000T5d-KT; Wed, 30 Mar 2022 14:53:14 +0530 From: Arun Isaac Date: Wed, 30 Mar 2022 14:53:09 +0530 Message-Id: <20220330092313.23584-1-arunisaac@systemreboot.net> X-Mailer: git-send-email 2.34.0 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 | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index ecb85642ec..f01bf51580 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,12 @@ (define-public gsl (string-append "exit (77);\n" all))))))) (else '())))))) + (native-inputs + (if (target-riscv64?) + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool)) + '())) (home-page "https://www.gnu.org/software/gsl/") (synopsis "Numerical library for C and C++") (description