From patchwork Wed Apr 10 07:15:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 62898 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 2D7A127BBEA; Wed, 10 Apr 2024 08:17:43 +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=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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 A0E4027BBE2 for ; Wed, 10 Apr 2024 08:17:42 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ruSCk-0005UW-8Q; Wed, 10 Apr 2024 03:17:10 -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 1ruSCi-0005Tv-JX for guix-patches@gnu.org; Wed, 10 Apr 2024 03:17:08 -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 1ruSCi-0002dZ-BC for guix-patches@gnu.org; Wed, 10 Apr 2024 03:17:08 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ruSCp-00078Z-Ti for guix-patches@gnu.org; Wed, 10 Apr 2024 03:17:16 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70158] [PATCH v2 1/3] gnu: scilab: Cleanup. 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, 10 Apr 2024 07:17:14 +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.171273336726784 (code B ref 70158); Wed, 10 Apr 2024 07:17:14 +0000 Received: (at 70158) by debbugs.gnu.org; 10 Apr 2024 07:16:07 +0000 Received: from localhost ([127.0.0.1]:51960 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ruSBY-0006wG-Nz for submit@debbugs.gnu.org; Wed, 10 Apr 2024 03:16:05 -0400 Received: from 4.mo582.mail-out.ovh.net ([87.98.184.159]:51069) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ruSBR-0006vJ-2N for 70158@debbugs.gnu.org; Wed, 10 Apr 2024 03:15:53 -0400 Received: from director1.ghost.mail-out.ovh.net (unknown [10.109.148.49]) by mo582.mail-out.ovh.net (Postfix) with ESMTP id 4VDvHZ2W8gz1Hrh for <70158@debbugs.gnu.org>; Wed, 10 Apr 2024 07:15:38 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-w6h27 (unknown [10.110.168.153]) by director1.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 11C421FE07; Wed, 10 Apr 2024 07:15:38 +0000 (UTC) Received: from ngraves.fr ([37.59.142.103]) by ghost-submission-6684bf9d7b-w6h27 with ESMTPSA id tGxRAZo8FmYwTQAA1Z8ScQ (envelope-from ); Wed, 10 Apr 2024 07:15:38 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-103G0058cd46f20-3937-485b-9633-a7bca932f657, 3D594BCB5898CC947373B117ED623EFC885049E0) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.146.208 Date: Wed, 10 Apr 2024 09:15:13 +0200 Message-ID: <20240410071517.30074-1-ngraves@ngraves.fr> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Ovh-Tracer-Id: 4366802791747412706 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvledrudehhedguddufecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeekffegteffgfffjeegjedvfffgtddvueeutefgfeeuvdejgedvgeejjeevueeuveenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddruddtfeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepjedtudehkeesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekvddpmhhouggvpehsmhhtphhouhht 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. More robust version setting in the set-version phase. It anticipates for the next release which will not use "main" anymore. [source](snippet) Sort dynamic_link deleted files. [inputs]: Add bash-minimal. Change-Id: I49b17886405e1ed8161e71b51655fa393ff7f10b --- gnu/packages/maths.scm | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 03760f3f3e..00b3ed213b 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -9759,9 +9759,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 @@ -9785,6 +9785,7 @@ (define-public scilab (inputs (list `(,pcre "bin") `(,pcre "out") arpack-ng + bash-minimal curl fftw gettext-minimal @@ -9842,10 +9843,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 @@ -9879,10 +9878,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 10 07:15:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 62897 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 A0B6827BBE9; Wed, 10 Apr 2024 08:17:27 +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=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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 5339627BBE2 for ; Wed, 10 Apr 2024 08:17:26 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ruSCt-0005X3-75; Wed, 10 Apr 2024 03:17:19 -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 1ruSCp-0005WX-Ue for guix-patches@gnu.org; Wed, 10 Apr 2024 03:17:15 -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 1ruSCp-0002e4-MH for guix-patches@gnu.org; Wed, 10 Apr 2024 03:17:15 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ruSCx-00079P-FR for guix-patches@gnu.org; Wed, 10 Apr 2024 03:17:23 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70158] [PATCH v2 2/3] gnu: scilab: Fixup and improve compilerDetection.sh script. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Apr 2024 07:17:22 +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.171273337426870 (code B ref 70158); Wed, 10 Apr 2024 07:17:22 +0000 Received: (at 70158) by debbugs.gnu.org; 10 Apr 2024 07:16:14 +0000 Received: from localhost ([127.0.0.1]:51962 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ruSBh-0006xx-Ti for submit@debbugs.gnu.org; Wed, 10 Apr 2024 03:16:12 -0400 Received: from 1.mo576.mail-out.ovh.net ([178.33.251.173]:59635) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ruSBR-0006vL-6v for 70158@debbugs.gnu.org; Wed, 10 Apr 2024 03:15:54 -0400 Received: from director11.ghost.mail-out.ovh.net (unknown [10.108.9.167]) by mo576.mail-out.ovh.net (Postfix) with ESMTP id 4VDvHb0K68z1jyp for <70158@debbugs.gnu.org>; Wed, 10 Apr 2024 07:15:39 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-zf556 (unknown [10.110.96.188]) by director11.ghost.mail-out.ovh.net (Postfix) with ESMTPS id B99C61FE72; Wed, 10 Apr 2024 07:15:38 +0000 (UTC) Received: from ngraves.fr ([37.59.142.101]) by ghost-submission-6684bf9d7b-zf556 with ESMTPSA id PQSsKpo8FmZjGQAAgGiL2g (envelope-from ); Wed, 10 Apr 2024 07:15:38 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-101G0046188bcf1-2204-44b3-b332-5762248c9683, 3D594BCB5898CC947373B117ED623EFC885049E0) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.146.208 Date: Wed, 10 Apr 2024 09:15:14 +0200 Message-ID: <20240410071517.30074-2-ngraves@ngraves.fr> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240410071517.30074-1-ngraves@ngraves.fr> References: <20240410071517.30074-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 4366802789448671970 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvledrudehhedguddufecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeelffejteeutefhfeekfffffedvudekjeekgfeludeitdfhkeevhfeivdfhffeggeenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddruddtudenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepjedtudehkeesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheejiedpmhhouggvpehsmhhtphhouhht 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. [source](patches): Add scilab-better-compiler-detection.patch. * gnu/packages/patches/scilab-better-compiler-detection.patch: Add file. * gnu/local.mk(dist_path_DATA): Add scilab-better-compiler-detection.patch. Change-Id: I7b1c78c4637fa1bc965eca8c516bf0b6cd4b92d1 --- gnu/local.mk | 1 + gnu/packages/maths.scm | 7 +++- .../scilab-better-compiler-detection.patch | 36 +++++++++++++++++++ 3 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/scilab-better-compiler-detection.patch diff --git a/gnu/local.mk b/gnu/local.mk index 255bb870e9..f8f4fd40d5 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2047,6 +2047,7 @@ dist_patch_DATA = \ %D%/packages/patches/sbcl-png-fix-sbcl-compatibility.patch \ %D%/packages/patches/scalapack-gcc-10-compilation.patch \ %D%/packages/patches/scheme48-tests.patch \ + %D%/packages/patches/scilab-better-compiler-detection.patch \ %D%/packages/patches/scons-test-environment.patch \ %D%/packages/patches/screen-hurd-path-max.patch \ %D%/packages/patches/scsh-nonstring-search-path.patch \ diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 00b3ed213b..0b6d8596eb 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -9715,6 +9715,7 @@ (define-public scilab (sha256 (base32 "08nyfli3x7gd396ffd1a8zn9fj3gm6a8yw0ggm547c09sp2rgvl7")) + (patches (search-patches "scilab-better-compiler-detection.patch")) (modules '((guix build utils) (ice-9 ftw))) (snippet @@ -9875,7 +9876,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. 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 10 07:15:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 62899 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 52C6527BBE2; Wed, 10 Apr 2024 08:17:54 +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=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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 6128427BBE2 for ; Wed, 10 Apr 2024 08:17:48 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ruSCx-0005XU-N8; Wed, 10 Apr 2024 03:17:23 -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 1ruSCw-0005XK-Dg for guix-patches@gnu.org; Wed, 10 Apr 2024 03:17:22 -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 1ruSCw-0002fk-5g for guix-patches@gnu.org; Wed, 10 Apr 2024 03:17:22 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ruSD4-0007AV-AB for guix-patches@gnu.org; Wed, 10 Apr 2024 03:17:30 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70158] [PATCH v2 3/3] 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, 10 Apr 2024 07:17:29 +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.171273342227286 (code B ref 70158); Wed, 10 Apr 2024 07:17:29 +0000 Received: (at 70158) by debbugs.gnu.org; 10 Apr 2024 07:17:02 +0000 Received: from localhost ([127.0.0.1]:51964 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ruSCR-00074j-KQ for submit@debbugs.gnu.org; Wed, 10 Apr 2024 03:16:59 -0400 Received: from 17.mo581.mail-out.ovh.net ([188.165.35.227]:41835) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ruSBS-0006vR-9m for 70158@debbugs.gnu.org; Wed, 10 Apr 2024 03:16:02 -0400 Received: from director11.ghost.mail-out.ovh.net (unknown [10.108.25.111]) by mo581.mail-out.ovh.net (Postfix) with ESMTP id 4VDvHc1R7yz1Ksn for <70158@debbugs.gnu.org>; Wed, 10 Apr 2024 07:15:40 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-ldvk6 (unknown [10.108.54.36]) by director11.ghost.mail-out.ovh.net (Postfix) with ESMTPS id CBC341FE67; Wed, 10 Apr 2024 07:15:39 +0000 (UTC) Received: from ngraves.fr ([37.59.142.96]) by ghost-submission-6684bf9d7b-ldvk6 with ESMTPSA id tX7eLZs8FmaP8gAAQWwohQ (envelope-from ); Wed, 10 Apr 2024 07:15:39 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-96R001dc5777b3-cafc-40b9-b07a-6136db972ce9, 3D594BCB5898CC947373B117ED623EFC885049E0) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.146.208 Date: Wed, 10 Apr 2024 09:15:15 +0200 Message-ID: <20240410071517.30074-3-ngraves@ngraves.fr> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240410071517.30074-1-ngraves@ngraves.fr> References: <20240410071517.30074-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 4367365739330921186 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvledrudehhedguddugecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeffkefghfektddtgfekgeefieefvdegjeehhfeflefgtdeggeelveeivdegueefvdenucffohhmrghinhepghhithhlrggsrdgtohhmnecukfhppeduvdejrddtrddtrddupdekuddrieejrddugeeirddvtdekpdefjedrheelrddugedvrdelieenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepjedtudehkeesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekuddpmhhouggvpehsmhhtphhouhht 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. * gnu/local.mk(dist_patch_DATA): Add gnu/packages/patches/scilab-tbx_build_help.patch. Change-Id: I8ee94afb4aba906cbc8c7ca67f4c89aa0cf55ae6 --- gnu/local.mk | 1 + gnu/packages/maths.scm | 3 +- .../patches/scilab-tbx_build_help.patch | 38 +++++++++++++++++++ 3 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/scilab-tbx_build_help.patch diff --git a/gnu/local.mk b/gnu/local.mk index f8f4fd40d5..f373fa016c 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2048,6 +2048,7 @@ dist_patch_DATA = \ %D%/packages/patches/scalapack-gcc-10-compilation.patch \ %D%/packages/patches/scheme48-tests.patch \ %D%/packages/patches/scilab-better-compiler-detection.patch \ + %D%/packages/patches/scilab-tbx_build_help.patch \ %D%/packages/patches/scons-test-environment.patch \ %D%/packages/patches/screen-hurd-path-max.patch \ %D%/packages/patches/scsh-nonstring-search-path.patch \ diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 0b6d8596eb..0d5382629d 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -9715,7 +9715,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..d2a9b41357 --- /dev/null +++ b/gnu/packages/patches/scilab-tbx_build_help.patch @@ -0,0 +1,38 @@ +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. + +upstream reference: https://gitlab.com/scilab/scilab/-/merge_requests/818 + +--- + .../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 +