From patchwork Wed Apr 3 06:25:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 62663 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 9407727BBE9; Wed, 3 Apr 2024 07:26:07 +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 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 94F8627BBE2 for ; Wed, 3 Apr 2024 07:26:05 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rru4P-0008SY-6S; Wed, 03 Apr 2024 02:26:02 -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 1rru4M-0008Rk-Gm for guix-patches@gnu.org; Wed, 03 Apr 2024 02:25:58 -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 1rru4M-0005aF-8u for guix-patches@gnu.org; Wed, 03 Apr 2024 02:25:58 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rru4Q-0004di-Dk for guix-patches@gnu.org; Wed, 03 Apr 2024 02:26:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70158] [PATCH 1/6] gnu: scilab: Remove unecessary code. References: <20240403062146.1652-1-ngraves@ngraves.fr> In-Reply-To: <20240403062146.1652-1-ngraves@ngraves.fr> Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 03 Apr 2024 06:26:02 +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.171212554317670 (code B ref 70158); Wed, 03 Apr 2024 06:26:02 +0000 Received: (at 70158) by debbugs.gnu.org; 3 Apr 2024 06:25:43 +0000 Received: from localhost ([127.0.0.1]:56841 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rru45-0004aT-23 for submit@debbugs.gnu.org; Wed, 03 Apr 2024 02:25:42 -0400 Received: from 2.mo576.mail-out.ovh.net ([178.33.251.80]:37771) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rru42-0004a3-LH for 70158@debbugs.gnu.org; Wed, 03 Apr 2024 02:25:39 -0400 Received: from director11.ghost.mail-out.ovh.net (unknown [10.108.25.2]) by mo576.mail-out.ovh.net (Postfix) with ESMTP id 4V8ZW04vs5z1fv3 for <70158@debbugs.gnu.org>; Wed, 3 Apr 2024 06:25:32 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-v5hqn (unknown [10.110.113.83]) by director11.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 32B021FEC2; Wed, 3 Apr 2024 06:25:32 +0000 (UTC) Received: from ngraves.fr ([37.59.142.98]) by ghost-submission-6684bf9d7b-v5hqn with ESMTPSA id ZbkvCFz2DGbnBQAA7pVx5w (envelope-from ); Wed, 03 Apr 2024 06:25:32 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-98R0028f788b5a-192a-465a-bb2b-4d3ec73c554e, 50F27E84980287D69AF642A420FD808EB57BA51D) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.146.208 Date: Wed, 3 Apr 2024 08:25:21 +0200 Message-ID: <20240403062528.5483-1-ngraves@ngraves.fr> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Ovh-Tracer-Id: 17752063831935279842 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvledrudeffedguddtjecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeekffegteffgfffjeegjedvfffgtddvueeutefgfeeuvdejgedvgeejjeevueeuveenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddrleeknecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeejtdduheekseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehjeeipdhmohguvgepshhmthhpohhuth 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>: In pre-build phase, remove unecessary code, due to the former introduction of the rewrap-scilab-cli phase. Change-Id: I49b17886405e1ed8161e71b51655fa393ff7f10b --- gnu/packages/maths.scm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 479591889f..8defc83534 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -9883,10 +9883,6 @@ (define-public scilab ((assoc-ref %standard-phases 'bootstrap))))) (add-before 'build 'pre-build (lambda* (#:key inputs #:allow-other-keys) - ;; Fix scilab script. - (substitute* "bin/scilab" - (("/bin/ls") - (search-input-file inputs "bin/ls"))) ;; Fix core.start. (substitute* "modules/core/etc/core.start" (("'SCI/modules") From patchwork Wed Apr 3 06:25:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 62665 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 90BD127BBE2; Wed, 3 Apr 2024 07:26:35 +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 A465827BBE9 for ; Wed, 3 Apr 2024 07:26:34 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rru4S-0008Su-98; Wed, 03 Apr 2024 02:26:04 -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-0008Ru-Hi 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 1rru4M-0005aK-Ks for guix-patches@gnu.org; Wed, 03 Apr 2024 02:25:58 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rru4Q-0004dq-Q3 for guix-patches@gnu.org; Wed, 03 Apr 2024 02:26:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70158] [PATCH 2/6] gnu: scilab: Sort dynamic_link deleted files. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 03 Apr 2024 06:26:02 +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.171212554617699 (code B ref 70158); Wed, 03 Apr 2024 06:26:02 +0000 Received: (at 70158) by debbugs.gnu.org; 3 Apr 2024 06:25:46 +0000 Received: from localhost ([127.0.0.1]:56845 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rru49-0004bN-JC for submit@debbugs.gnu.org; Wed, 03 Apr 2024 02:25:45 -0400 Received: from 1.mo581.mail-out.ovh.net ([178.33.45.51]:38467) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rru43-0004a5-J7 for 70158@debbugs.gnu.org; Wed, 03 Apr 2024 02:25:41 -0400 Received: from director3.ghost.mail-out.ovh.net (unknown [10.109.148.146]) by mo581.mail-out.ovh.net (Postfix) with ESMTP id 4V8ZW13g9Gz1DNr for <70158@debbugs.gnu.org>; Wed, 3 Apr 2024 06:25:33 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-hq9zp (unknown [10.110.113.134]) by director3.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 2C6CE1FD81; Wed, 3 Apr 2024 06:25:33 +0000 (UTC) Received: from ngraves.fr ([37.59.142.102]) by ghost-submission-6684bf9d7b-hq9zp with ESMTPSA id VF7oB132DGbVggAAfRso+A (envelope-from ); Wed, 03 Apr 2024 06:25:33 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-102R004a6e52ff1-4fb9-4055-a4c0-e4049400aa3d, 50F27E84980287D69AF642A420FD808EB57BA51D) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.146.208 Date: Wed, 3 Apr 2024 08:25:22 +0200 Message-ID: <20240403062528.5483-2-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: 17752345308968641250 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvledrudeffedguddtjecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeelffejteeutefhfeekfffffedvudekjeekgfeludeitdfhkeevhfeivdfhffeggeenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddruddtvdenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepjedtudehkeesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekuddpmhhouggvpehsmhhtphhouhht 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): [source](snippet) Sort dynamic_link deleted files. Change-Id: Iecc013bcef6ddc146daba10b4944ff84141d83cc --- gnu/packages/maths.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 8defc83534..0cb31abf7b 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -9762,9 +9762,9 @@ (define-public scilab "compile" "config.guess" "config.sub" - "ltmain.sh" "depcomp" "install-sh" + "ltmain.sh" "missing")) (delete-file-recursively "modules/dynamic_link/src/scripts/m4") (for-each delete-file 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. From patchwork Wed Apr 3 06:25:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 62667 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 3011D27BBEA; Wed, 3 Apr 2024 07:26:44 +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 AAF8527BBE2 for ; Wed, 3 Apr 2024 07:26:43 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rru4V-0008VG-Lt; 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-0008Rx-Ls 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-0005aZ-U7 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 1rru4S-0004eC-2N for guix-patches@gnu.org; Wed, 03 Apr 2024 02:26:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70158] [PATCH 4/6] gnu: scilab: Simpler and more robust version setting. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 03 Apr 2024 06:26:04 +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.171212554717720 (code B ref 70158); Wed, 03 Apr 2024 06:26:04 +0000 Received: (at 70158) by debbugs.gnu.org; 3 Apr 2024 06:25:47 +0000 Received: from localhost ([127.0.0.1]:56851 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rru4A-0004bf-Jj for submit@debbugs.gnu.org; Wed, 03 Apr 2024 02:25:46 -0400 Received: from 7.mo560.mail-out.ovh.net ([188.165.48.182]:48121) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rru45-0004aN-FC for 70158@debbugs.gnu.org; Wed, 03 Apr 2024 02:25:44 -0400 Received: from director8.ghost.mail-out.ovh.net (unknown [10.108.17.174]) by mo560.mail-out.ovh.net (Postfix) with ESMTP id 4V8ZW405bGz1S3d for <70158@debbugs.gnu.org>; Wed, 3 Apr 2024 06:25:35 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-nxz6k (unknown [10.110.168.40]) by director8.ghost.mail-out.ovh.net (Postfix) with ESMTPS id A4ED61FD26; Wed, 3 Apr 2024 06:25:35 +0000 (UTC) Received: from ngraves.fr ([37.59.142.105]) by ghost-submission-6684bf9d7b-nxz6k with ESMTPSA id I6vtI1/2DGZyNAAA2vvR1Q (envelope-from ); Wed, 03 Apr 2024 06:25:35 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-105G0069b87b226-2896-4881-8a25-656630787849, 50F27E84980287D69AF642A420FD808EB57BA51D) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.146.208 Date: Wed, 3 Apr 2024 08:25:24 +0200 Message-ID: <20240403062528.5483-4-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: 17752908258264277730 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvledrudeffedguddtjecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeelffejteeutefhfeekfffffedvudekjeekgfeludeitdfhkeevhfeivdfhffeggeenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddruddtheenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepjedtudehkeesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheeitddpmhhouggvpehsmhhtphhouhht 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>: Simpler and more robust version setting in version.h.in. It saves two lines and anticipates for the next release which will not use "main" anymore. Change-Id: Ib052756a55528e991da54d880205c75ab2c6fa5f --- gnu/packages/maths.scm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index c920bc2f30..9223a86eab 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -9846,10 +9846,8 @@ (define-public scilab (add-after 'unpack 'set-version (lambda _ (substitute* "modules/core/includes/version.h.in" - (("scilab-branch-main") ; version - (string-append - "scilab-" - #$(version-major+minor (package-version this-package))))))) + (("branch-[a-z0-9\\.]*") ; version + #$(version-major+minor (package-version this-package)))))) (add-after 'unpack 'restrain-to-scilab-cli (lambda _ ;; Install only scilab-cli.desktop From patchwork Wed Apr 3 06:25:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 62666 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 721D627BBEA; Wed, 3 Apr 2024 07:26:37 +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 C680227BBE2 for ; Wed, 3 Apr 2024 07:26:36 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rru4S-0008Sy-D0; Wed, 03 Apr 2024 02:26:04 -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-0008Rw-Kv 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-0005aS-Eb 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-0004e4-Iw for guix-patches@gnu.org; Wed, 03 Apr 2024 02:26:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70158] [PATCH 5/6] gnu: scilab: Improve compilerDetection.sh. 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.171212554617714 (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]:56849 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rru4A-0004bY-7A for submit@debbugs.gnu.org; Wed, 03 Apr 2024 02:25:46 -0400 Received: from 20.mo584.mail-out.ovh.net ([46.105.33.73]:42557) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rru46-0004al-P1 for 70158@debbugs.gnu.org; Wed, 03 Apr 2024 02:25:44 -0400 Received: from director7.ghost.mail-out.ovh.net (unknown [10.109.139.43]) by mo584.mail-out.ovh.net (Postfix) with ESMTP id 4V8ZW51bjSz1BtQ for <70158@debbugs.gnu.org>; Wed, 3 Apr 2024 06:25:37 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-mntx8 (unknown [10.110.113.80]) by director7.ghost.mail-out.ovh.net (Postfix) with ESMTPS id EE6E21FDF3; Wed, 3 Apr 2024 06:25:36 +0000 (UTC) Received: from ngraves.fr ([37.59.142.95]) by ghost-submission-6684bf9d7b-mntx8 with ESMTPSA id m/IVN2D2DGbcqzoAZeA2CA (envelope-from ); Wed, 03 Apr 2024 06:25:36 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-95G0018a23e010-cf05-469a-ae0b-ce2e637c66e2, 50F27E84980287D69AF642A420FD808EB57BA51D) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.146.208 Date: Wed, 3 Apr 2024 08:25:25 +0200 Message-ID: <20240403062528.5483-5-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: 17753471206076703458 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvledrudeffedguddtjecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeelffejteeutefhfeekfffffedvudekjeekgfeludeitdfhkeevhfeivdfhffeggeenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddrleehnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeejtdduheekseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehkeegpdhmohguvgepshhmthhpohhuth 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)[source]: Improve compilerDetection.sh error reporting on Guix. * gnu/packages/patches/scilab-better-compiler-detection.patch : Add patch. Change-Id: Ic055650bc490f8963bf130a126ffbbb51f437811 --- gnu/packages/maths.scm | 1 + .../scilab-better-compiler-detection.patch | 36 +++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 gnu/packages/patches/scilab-better-compiler-detection.patch diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 9223a86eab..0d530851b1 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -9718,6 +9718,7 @@ (define-public scilab (sha256 (base32 "08nyfli3x7gd396ffd1a8zn9fj3gm6a8yw0ggm547c09sp2rgvl7")) + (patches (search-patches "scilab-better-compiler-detection.patch")) (modules '((guix build utils) (ice-9 ftw))) (snippet diff --git a/gnu/packages/patches/scilab-better-compiler-detection.patch b/gnu/packages/patches/scilab-better-compiler-detection.patch new file mode 100644 index 0000000000..225f773826 --- /dev/null +++ b/gnu/packages/patches/scilab-better-compiler-detection.patch @@ -0,0 +1,36 @@ +From fada18edd8905f3321fd1719b1c0a46c66d214af Mon Sep 17 00:00:00 2001 +From: Nicolas Graves +Date: Wed, 27 Mar 2024 06:29:25 +0100 +Subject: [PATCH] scilab: Better debugging in compilerDetection.sh. + +--- + .../dynamic_link/src/scripts/compilerDetection.sh | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +diff --git a/scilab/modules/dynamic_link/src/scripts/compilerDetection.sh b/scilab/modules/dynamic_link/src/scripts/compilerDetection.sh +index 0a22a695555..ead86eb58ac 100755 +--- a/scilab/modules/dynamic_link/src/scripts/compilerDetection.sh ++++ b/scilab/modules/dynamic_link/src/scripts/compilerDetection.sh +@@ -18,10 +18,16 @@ if test -x "$(which gcc 2>/dev/null)"; then + fi + + # Relaunch configure if files are missing +-if test ! -s Makefile.orig -o ! -s libtool; then ++if test ! -s Makefile.orig -o ! -s libtool; then + echo "Detection of C/C++/Fortran Compilers" + ./configure --disable-static --disable-dependency-tracking "$@" +- mv Makefile Makefile.orig +-else ++ configure_exit_status=$? ++ if [ $configure_exit_status -ne 0 ]; then ++ cat config.log ++ exit $configure_exit_status ++ else ++ mv Makefile Makefile.orig ++ fi ++else + echo "Detection of compilers already done" + fi +-- +2.41.0 + From patchwork Wed Apr 3 06:25:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 62664 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 01AD627BBEA; Wed, 3 Apr 2024 07:26:33 +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 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 57D8027BBE2 for ; Wed, 3 Apr 2024 07:26:33 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rru4S-0008T1-Gt; Wed, 03 Apr 2024 02:26:04 -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-0008SN-VJ 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 1rru4O-0005ao-Ia 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 1rru4S-0004eQ-Jb for guix-patches@gnu.org; Wed, 03 Apr 2024 02:26:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70158] [PATCH 6/6] gnu: scilab: Improve package management robustness in scilab-cli. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 03 Apr 2024 06:26:04 +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.171212555317775 (code B ref 70158); Wed, 03 Apr 2024 06:26:04 +0000 Received: (at 70158) by debbugs.gnu.org; 3 Apr 2024 06:25:53 +0000 Received: from localhost ([127.0.0.1]:56854 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rru4G-0004cd-Um for submit@debbugs.gnu.org; Wed, 03 Apr 2024 02:25:53 -0400 Received: from 11.mo584.mail-out.ovh.net ([46.105.34.195]:41081) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rru4B-0004bd-6Y for 70158@debbugs.gnu.org; Wed, 03 Apr 2024 02:25:49 -0400 Received: from director3.ghost.mail-out.ovh.net (unknown [10.108.25.157]) by mo584.mail-out.ovh.net (Postfix) with ESMTP id 4V8ZW95r6Tz1CxM for <70158@debbugs.gnu.org>; Wed, 3 Apr 2024 06:25:41 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-j25md (unknown [10.110.178.91]) by director3.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 9AB0E1FE97; Wed, 3 Apr 2024 06:25:41 +0000 (UTC) Received: from ngraves.fr ([37.59.142.95]) by ghost-submission-6684bf9d7b-j25md with ESMTPSA id GxtfJGX2DGaKEQAAYVxGrA (envelope-from ); Wed, 03 Apr 2024 06:25:41 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-95G0011b117b66-23e0-42f7-bf23-f54bcf4655d3, 50F27E84980287D69AF642A420FD808EB57BA51D) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.146.208 Date: Wed, 3 Apr 2024 08:25:26 +0200 Message-ID: <20240403062528.5483-6-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: 17754597109986288354 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvledrudeffedguddtjecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeelffejteeutefhfeekfffffedvudekjeekgfeludeitdfhkeevhfeivdfhffeggeenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddrleehnecuvehluhhsthgvrhfuihiivgepudenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeejtdduheekseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehkeegpdhmohguvgepshhmthhpohhuth 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)[source]: Improve package management robustness in scilab-cli by allowing tbx_build_help to log the scilab mode incompatibility error and not process the rest of the function instead of failing with it. * gnu/packages/patches/scilab-tbx_build_help.patch : Add patch. Change-Id: I8ee94afb4aba906cbc8c7ca67f4c89aa0cf55ae6 --- gnu/packages/maths.scm | 3 +- .../patches/scilab-tbx_build_help.patch | 36 +++++++++++++++++++ 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/scilab-tbx_build_help.patch diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 0d530851b1..1c9a5dcf02 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -9718,7 +9718,8 @@ (define-public scilab (sha256 (base32 "08nyfli3x7gd396ffd1a8zn9fj3gm6a8yw0ggm547c09sp2rgvl7")) - (patches (search-patches "scilab-better-compiler-detection.patch")) + (patches (search-patches "scilab-better-compiler-detection.patch" + "scilab-tbx_build_help.patch")) (modules '((guix build utils) (ice-9 ftw))) (snippet diff --git a/gnu/packages/patches/scilab-tbx_build_help.patch b/gnu/packages/patches/scilab-tbx_build_help.patch new file mode 100644 index 0000000000..6e6826d494 --- /dev/null +++ b/gnu/packages/patches/scilab-tbx_build_help.patch @@ -0,0 +1,36 @@ +From c59d78c5a5c8c187450f157cf7f8480455e8e6a2 Mon Sep 17 00:00:00 2001 +From: Nicolas Graves +Date: Wed, 3 Apr 2024 03:32:23 +0200 +Subject: [PATCH] scilab: tbx_build_help: Allow for some flexibility under + -nwni. + +--- + .../modules_manager/macros/tbx_build_help.sci | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/scilab/modules/modules_manager/macros/tbx_build_help.sci b/scilab/modules/modules_manager/macros/tbx_build_help.sci +index 7862e33a868..5593ee3dc04 100644 +--- a/scilab/modules/modules_manager/macros/tbx_build_help.sci ++++ b/scilab/modules/modules_manager/macros/tbx_build_help.sci +@@ -58,12 +58,12 @@ function tbx_build_help(moduletitle, path) + + // Check scilab mode + if and(getscilabmode() <> ["STD" "NW"]) then +- error(msprintf(gettext("%s: documentation cannot be built in this scilab mode: %s.\n"),"tbx_build_help",getscilabmode())); ++ msprintf(gettext("%s: documentation cannot be built in this scilab mode: %s.\n"),"tbx_build_help",getscilabmode()); ++ else ++ directory_language = basename(path); ++ default_language = "en_US" ++ ++ xmltojar(path, moduletitle, directory_language, default_language); + end + +- directory_language = basename(path); +- default_language = "en_US" +- +- xmltojar(path, moduletitle, directory_language, default_language); +- + endfunction +-- +2.41.0 +