From patchwork Wed Apr 3 06:25:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 62668 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 4696427BBEA; Wed, 3 Apr 2024 07:26: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.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 B933727BBE2 for ; Wed, 3 Apr 2024 07:26:52 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rru4V-0008Ux-C8; Wed, 03 Apr 2024 02:26:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rru4O-0008Ry-M4 for guix-patches@gnu.org; Wed, 03 Apr 2024 02:26:00 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rru4N-0005aN-2G for guix-patches@gnu.org; Wed, 03 Apr 2024 02:26:00 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rru4R-0004dx-6h for guix-patches@gnu.org; Wed, 03 Apr 2024 02:26:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70158] [PATCH 3/6] gnu: scilab: Fixup badly-written compilerDetection.sh script. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 03 Apr 2024 06:26:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70158 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70158@debbugs.gnu.org Cc: ngraves@ngraves.fr Received: via spool by 70158-submit@debbugs.gnu.org id=B70158.171212554617706 (code B ref 70158); Wed, 03 Apr 2024 06:26:03 +0000 Received: (at 70158) by debbugs.gnu.org; 3 Apr 2024 06:25:46 +0000 Received: from localhost ([127.0.0.1]:56847 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rru49-0004bQ-Ti for submit@debbugs.gnu.org; Wed, 03 Apr 2024 02:25:46 -0400 Received: from 2.mo560.mail-out.ovh.net ([188.165.53.149]:45961) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rru44-0004a7-S4 for 70158@debbugs.gnu.org; Wed, 03 Apr 2024 02:25:42 -0400 Received: from director5.ghost.mail-out.ovh.net (unknown [10.109.140.55]) by mo560.mail-out.ovh.net (Postfix) with ESMTP id 4V8ZW24tllz1S4N for <70158@debbugs.gnu.org>; Wed, 3 Apr 2024 06:25:34 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-gwbdk (unknown [10.110.96.204]) by director5.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 41B191FD43; Wed, 3 Apr 2024 06:25:34 +0000 (UTC) Received: from ngraves.fr ([37.59.142.101]) by ghost-submission-6684bf9d7b-gwbdk with ESMTPSA id YX7KCV72DGYcezQAHW5+HA (envelope-from ); Wed, 03 Apr 2024 06:25:34 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-101G00492e0aa73-6b9c-4e26-a493-91bc6bdcd547, 50F27E84980287D69AF642A420FD808EB57BA51D) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.146.208 Date: Wed, 3 Apr 2024 08:25:23 +0200 Message-ID: <20240403062528.5483-3-ngraves@ngraves.fr> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240403062528.5483-1-ngraves@ngraves.fr> References: <20240403062528.5483-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 17752626784839262946 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvledrudeffedguddtjecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeelffejteeutefhfeekfffffedvudekjeekgfeludeitdfhkeevhfeivdfhffeggeenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddruddtudenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepjedtudehkeesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheeitddpmhhouggvpehsmhhtphhouhht 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: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/maths.scm (scilab) [arguments]<#:phases>: Fix compilerDetection.sh script in phase bootstrap-dynamic_link-scripts. Change-Id: I7b1c78c4637fa1bc965eca8c516bf0b6cd4b92d1 --- gnu/packages/maths.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 0cb31abf7b..c920bc2f30 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -9880,7 +9880,11 @@ (define-public scilab (add-after 'bootstrap 'bootstrap-dynamic_link-scripts (lambda _ (with-directory-excursion "modules/dynamic_link/src/scripts" - ((assoc-ref %standard-phases 'bootstrap))))) + ((assoc-ref %standard-phases 'bootstrap)) + (substitute* "compilerDetection.sh" + (("PATHTOCONFIGURE=.*") + "PATHTOCONFIGURE=${BASH_SOURCE[0]%/*}/\n") + (("PROGNAME.*") "\n"))))) (add-before 'build 'pre-build (lambda* (#:key inputs #:allow-other-keys) ;; Fix core.start.