Received: (at 70158) by debbugs.gnu.org; 10 Apr 2024 07:17:02 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Apr 10 03:17:00 2024
Received: from localhost ([127.0.0.1]:51964 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1ruSCR-00074j-KQ
for submit <at> 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 <ngraves@HIDDEN>) id 1ruSBS-0006vR-9m
for 70158 <at> 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 <at> 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 <ngraves@HIDDEN>); Wed, 10 Apr 2024 07:15:39 +0000
Authentication-Results: garm.ovh; auth=pass
(GARM-96R001dc5777b3-cafc-40b9-b07a-6136db972ce9,
3D594BCB5898CC947373B117ED623EFC885049E0) smtp.auth=ngraves@HIDDEN
X-OVh-ClientIp: 81.67.146.208
From: Nicolas Graves <ngraves@HIDDEN>
To: 70158 <at> debbugs.gnu.org
Subject: [PATCH v2 3/3] gnu: scilab: Improve package management robustness in
scilab-cli.
Date: Wed, 10 Apr 2024 09:15:15 +0200
Message-ID: <20240410071517.30074-3-ngraves@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <20240410071517.30074-1-ngraves@HIDDEN>
References: <20240410071517.30074-1-ngraves@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Ovh-Tracer-Id: 4367365739330921186
X-VR-SPAMSTATE: OK
X-VR-SPAMSCORE: 0
X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvledrudehhedguddugecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeffkefghfektddtgfekgeefieefvdegjeehhfeflefgtdeggeelveeivdegueefvdenucffohhmrghinhepghhithhlrggsrdgtohhmnecukfhppeduvdejrddtrddtrddupdekuddrieejrddugeeirddvtdekpdefjedrheelrddugedvrdelieenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepjedtudehkeesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekuddpmhhouggvpehsmhhtphhouhht
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 70158
Cc: ngraves@HIDDEN
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* gnu/packages/maths.scm (scilab)[source]<origin>: 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 <ngraves@HIDDEN>
+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
+
--
2.41.0
guix-patches@HIDDEN:bug#70158; Package guix-patches.
Full text available.
Received: (at 70158) by debbugs.gnu.org; 10 Apr 2024 07:16:14 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Apr 10 03:16:12 2024
Received: from localhost ([127.0.0.1]:51962 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1ruSBh-0006xx-Ti
for submit <at> 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 <ngraves@HIDDEN>) id 1ruSBR-0006vL-6v
for 70158 <at> 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 <at> 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 <ngraves@HIDDEN>); Wed, 10 Apr 2024 07:15:38 +0000
Authentication-Results: garm.ovh; auth=pass
(GARM-101G0046188bcf1-2204-44b3-b332-5762248c9683,
3D594BCB5898CC947373B117ED623EFC885049E0) smtp.auth=ngraves@HIDDEN
X-OVh-ClientIp: 81.67.146.208
From: Nicolas Graves <ngraves@HIDDEN>
To: 70158 <at> debbugs.gnu.org
Subject: [PATCH v2 2/3] gnu: scilab: Fixup and improve compilerDetection.sh
script.
Date: Wed, 10 Apr 2024 09:15:14 +0200
Message-ID: <20240410071517.30074-2-ngraves@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <20240410071517.30074-1-ngraves@HIDDEN>
References: <20240410071517.30074-1-ngraves@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Ovh-Tracer-Id: 4366802789448671970
X-VR-SPAMSTATE: OK
X-VR-SPAMSCORE: 0
X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvledrudehhedguddufecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeelffejteeutefhfeekfffffedvudekjeekgfeludeitdfhkeevhfeivdfhffeggeenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddruddtudenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepjedtudehkeesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheejiedpmhhouggvpehsmhhtphhouhht
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 70158
Cc: ngraves@HIDDEN
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* gnu/packages/maths.scm (scilab)
[arguments]<#:phases>: Fix compilerDetection.sh script in phase
bootstrap-dynamic_link-scripts.
[source]<origin>(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 <ngraves@HIDDEN>
+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
+
--
2.41.0
guix-patches@HIDDEN:bug#70158; Package guix-patches.
Full text available.
Received: (at 70158) by debbugs.gnu.org; 10 Apr 2024 07:16:07 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Apr 10 03:16:06 2024
Received: from localhost ([127.0.0.1]:51960 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1ruSBY-0006wG-Nz
for submit <at> 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 <ngraves@HIDDEN>) id 1ruSBR-0006vJ-2N
for 70158 <at> 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 <at> 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 <ngraves@HIDDEN>); Wed, 10 Apr 2024 07:15:38 +0000
Authentication-Results: garm.ovh; auth=pass
(GARM-103G0058cd46f20-3937-485b-9633-a7bca932f657,
3D594BCB5898CC947373B117ED623EFC885049E0) smtp.auth=ngraves@HIDDEN
X-OVh-ClientIp: 81.67.146.208
From: Nicolas Graves <ngraves@HIDDEN>
To: 70158 <at> debbugs.gnu.org
Subject: [PATCH v2 1/3] gnu: scilab: Cleanup.
Date: Wed, 10 Apr 2024 09:15:13 +0200
Message-ID: <20240410071517.30074-1-ngraves@HIDDEN>
X-Mailer: git-send-email 2.41.0
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Ovh-Tracer-Id: 4366802791747412706
X-VR-SPAMSTATE: OK
X-VR-SPAMSCORE: 0
X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvledrudehhedguddufecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeekffegteffgfffjeegjedvfffgtddvueeutefgfeeuvdejgedvgeejjeevueeuveenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddruddtfeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepjedtudehkeesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekvddpmhhouggvpehsmhhtphhouhht
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 70158
Cc: ngraves@HIDDEN
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* 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]<origin>(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")
--
2.41.0
guix-patches@HIDDEN:bug#70158; Package guix-patches.
Full text available.Received: (at 70158) by debbugs.gnu.org; 10 Apr 2024 05:48:36 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Wed Apr 10 01:48:36 2024 Received: from localhost ([127.0.0.1]:51887 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1ruQp2-0002uh-2b for submit <at> debbugs.gnu.org; Wed, 10 Apr 2024 01:48:36 -0400 Received: from 3.mo576.mail-out.ovh.net ([188.165.52.203]:57473) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <ngraves@HIDDEN>) id 1ruQov-0002tE-7d for 70158 <at> debbugs.gnu.org; Wed, 10 Apr 2024 01:48:33 -0400 Received: from director7.ghost.mail-out.ovh.net (unknown [10.109.148.87]) by mo576.mail-out.ovh.net (Postfix) with ESMTP id 4VDsLn4mtCz1fY1 for <70158 <at> debbugs.gnu.org>; Wed, 10 Apr 2024 05:48:17 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-66rnv (unknown [10.108.54.69]) by director7.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 447EF1FDC3; Wed, 10 Apr 2024 05:48:17 +0000 (UTC) Received: from ngraves.fr ([37.59.142.107]) by ghost-submission-6684bf9d7b-66rnv with ESMTPSA id UCbpCCEoFmb2AwAAs2hl1g (envelope-from <ngraves@HIDDEN>); Wed, 10 Apr 2024 05:48:17 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-107S001bbddd48d-76da-45b3-a0b8-27df5ea0826e, 3D594BCB5898CC947373B117ED623EFC885049E0) smtp.auth=ngraves@HIDDEN X-OVh-ClientIp: 81.67.146.208 From: Nicolas Graves <ngraves@HIDDEN> To: David Elsing <david.elsing@HIDDEN> Subject: Re: [PATCH 0/6] Scilab: Fixup install of local Scilab packages. In-Reply-To: <8634rv5vwj.fsf@HIDDEN> References: <8634rv5vwj.fsf@HIDDEN> Date: Wed, 10 Apr 2024 07:48:16 +0200 Message-ID: <87seztdazj.fsf@HIDDEN> MIME-Version: 1.0 Content-Type: text/plain X-Ovh-Tracer-Id: 2891592435960832736 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvledrudehhedgleeiucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmnecujfgurhephffvvefujghffffkgggtsehttdertddttddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepveekleeujedthefgffekleekhffhffetgfdvheekleeuhfehueeljedtjefhvdfgnecukfhppeduvdejrddtrddtrddupdekuddrieejrddugeeirddvtdekpdefjedrheelrddugedvrddutdejnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeejtdduheekseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehjeeipdhmohguvgepshhmthhpohhuth X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 70158 Cc: 70158 <at> debbugs.gnu.org X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) On 2024-04-08 22:31, David Elsing wrote: > Hi Nicolas, > > I'm not really familiar with Scilab itself, I worked on the package to > update the SuiteSparse dependency and noticed that many files were > autogenerated. Thanks for your review David. > > Here are some comments about your patches: > - I think patches 1, 2 and 4 can be combined, as well as patches 3, 5 > and 6, or was there a reason to split them? 6 is separate from 3 and 5, I'll merge the other though, thanks! > - For patch 4, I don't think you need to mention how many lines are > saved in the commit message. :) DONE > - For patches 5 and 6, my impression was that patch files should have a > comment and mention the upstream status if relevant. Maybe you can > additionally make a merge request upstream for them, as they do not > seem specific to Guix? Patch files should also be registered in > gnu/local.mk. I will. > - `guix lint` mentions that "bash-minimal" should be in 'inputs' when > 'wrap-program' is used. This is relevant for cross builds, but at the > moment, dune-build-system (for OCaml packages) does not support cross > builds anyway. It wouldn't hurt to add bash-minimal anyway though. Thanks, will add that too. > > Otherwise, they look fine to me. > > Cheers, > David -- Best regards, Nicolas Graves
guix-patches@HIDDEN:bug#70158; Package guix-patches.
Full text available.
Received: (at 70158) by debbugs.gnu.org; 3 Apr 2024 06:25:53 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Apr 03 02:25:53 2024
Received: from localhost ([127.0.0.1]:56854 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rru4G-0004cd-Um
for submit <at> 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 <ngraves@HIDDEN>) id 1rru4B-0004bd-6Y
for 70158 <at> 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 <at> 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 <ngraves@HIDDEN>); Wed, 03 Apr 2024 06:25:41 +0000
Authentication-Results: garm.ovh; auth=pass
(GARM-95G0011b117b66-23e0-42f7-bf23-f54bcf4655d3,
50F27E84980287D69AF642A420FD808EB57BA51D) smtp.auth=ngraves@HIDDEN
X-OVh-ClientIp: 81.67.146.208
From: Nicolas Graves <ngraves@HIDDEN>
To: 70158 <at> debbugs.gnu.org
Subject: [PATCH 6/6] gnu: scilab: Improve package management robustness in
scilab-cli.
Date: Wed, 3 Apr 2024 08:25:26 +0200
Message-ID: <20240403062528.5483-6-ngraves@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <20240403062528.5483-1-ngraves@HIDDEN>
References: <20240403062528.5483-1-ngraves@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Ovh-Tracer-Id: 17754597109986288354
X-VR-SPAMSTATE: OK
X-VR-SPAMSCORE: 0
X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvledrudeffedguddtjecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeelffejteeutefhfeekfffffedvudekjeekgfeludeitdfhkeevhfeivdfhffeggeenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddrleehnecuvehluhhsthgvrhfuihiivgepudenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeejtdduheekseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehkeegpdhmohguvgepshhmthhpohhuth
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 70158
Cc: ngraves@HIDDEN
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* gnu/packages/maths.scm (scilab)[source]<origin>: 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 <ngraves@HIDDEN>
+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
+
--
2.41.0
guix-patches@HIDDEN:bug#70158; Package guix-patches.
Full text available.
Received: (at 70158) by debbugs.gnu.org; 3 Apr 2024 06:25:47 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Apr 03 02:25:46 2024
Received: from localhost ([127.0.0.1]:56851 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rru4A-0004bf-Jj
for submit <at> 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 <ngraves@HIDDEN>) id 1rru45-0004aN-FC
for 70158 <at> 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 <at> 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 <ngraves@HIDDEN>); Wed, 03 Apr 2024 06:25:35 +0000
Authentication-Results: garm.ovh; auth=pass
(GARM-105G0069b87b226-2896-4881-8a25-656630787849,
50F27E84980287D69AF642A420FD808EB57BA51D) smtp.auth=ngraves@HIDDEN
X-OVh-ClientIp: 81.67.146.208
From: Nicolas Graves <ngraves@HIDDEN>
To: 70158 <at> debbugs.gnu.org
Subject: [PATCH 4/6] gnu: scilab: Simpler and more robust version setting.
Date: Wed, 3 Apr 2024 08:25:24 +0200
Message-ID: <20240403062528.5483-4-ngraves@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <20240403062528.5483-1-ngraves@HIDDEN>
References: <20240403062528.5483-1-ngraves@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Ovh-Tracer-Id: 17752908258264277730
X-VR-SPAMSTATE: OK
X-VR-SPAMSCORE: 0
X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvledrudeffedguddtjecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeelffejteeutefhfeekfffffedvudekjeekgfeludeitdfhkeevhfeivdfhffeggeenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddruddtheenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepjedtudehkeesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheeitddpmhhouggvpehsmhhtphhouhht
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 70158
Cc: ngraves@HIDDEN
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* 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
--
2.41.0
guix-patches@HIDDEN:bug#70158; Package guix-patches.
Full text available.
Received: (at 70158) by debbugs.gnu.org; 3 Apr 2024 06:25:46 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Apr 03 02:25:46 2024
Received: from localhost ([127.0.0.1]:56849 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rru4A-0004bY-7A
for submit <at> 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 <ngraves@HIDDEN>) id 1rru46-0004al-P1
for 70158 <at> 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 <at> 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 <ngraves@HIDDEN>); Wed, 03 Apr 2024 06:25:36 +0000
Authentication-Results: garm.ovh; auth=pass
(GARM-95G0018a23e010-cf05-469a-ae0b-ce2e637c66e2,
50F27E84980287D69AF642A420FD808EB57BA51D) smtp.auth=ngraves@HIDDEN
X-OVh-ClientIp: 81.67.146.208
From: Nicolas Graves <ngraves@HIDDEN>
To: 70158 <at> debbugs.gnu.org
Subject: [PATCH 5/6] gnu: scilab: Improve compilerDetection.sh.
Date: Wed, 3 Apr 2024 08:25:25 +0200
Message-ID: <20240403062528.5483-5-ngraves@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <20240403062528.5483-1-ngraves@HIDDEN>
References: <20240403062528.5483-1-ngraves@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Ovh-Tracer-Id: 17753471206076703458
X-VR-SPAMSTATE: OK
X-VR-SPAMSCORE: 0
X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvledrudeffedguddtjecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeelffejteeutefhfeekfffffedvudekjeekgfeludeitdfhkeevhfeivdfhffeggeenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddrleehnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeejtdduheekseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehkeegpdhmohguvgepshhmthhpohhuth
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 70158
Cc: ngraves@HIDDEN
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* gnu/packages/maths.scm (scilab)[source]<origin>: 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 <ngraves@HIDDEN>
+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
+
--
2.41.0
guix-patches@HIDDEN:bug#70158; Package guix-patches.
Full text available.
Received: (at 70158) by debbugs.gnu.org; 3 Apr 2024 06:25:46 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Apr 03 02:25:46 2024
Received: from localhost ([127.0.0.1]:56847 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rru49-0004bQ-Ti
for submit <at> 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 <ngraves@HIDDEN>) id 1rru44-0004a7-S4
for 70158 <at> 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 <at> 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 <ngraves@HIDDEN>); Wed, 03 Apr 2024 06:25:34 +0000
Authentication-Results: garm.ovh; auth=pass
(GARM-101G00492e0aa73-6b9c-4e26-a493-91bc6bdcd547,
50F27E84980287D69AF642A420FD808EB57BA51D) smtp.auth=ngraves@HIDDEN
X-OVh-ClientIp: 81.67.146.208
From: Nicolas Graves <ngraves@HIDDEN>
To: 70158 <at> debbugs.gnu.org
Subject: [PATCH 3/6] gnu: scilab: Fixup badly-written compilerDetection.sh
script.
Date: Wed, 3 Apr 2024 08:25:23 +0200
Message-ID: <20240403062528.5483-3-ngraves@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <20240403062528.5483-1-ngraves@HIDDEN>
References: <20240403062528.5483-1-ngraves@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Ovh-Tracer-Id: 17752626784839262946
X-VR-SPAMSTATE: OK
X-VR-SPAMSCORE: 0
X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvledrudeffedguddtjecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeelffejteeutefhfeekfffffedvudekjeekgfeludeitdfhkeevhfeivdfhffeggeenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddruddtudenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepjedtudehkeesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheeitddpmhhouggvpehsmhhtphhouhht
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 70158
Cc: ngraves@HIDDEN
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* 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.
--
2.41.0
guix-patches@HIDDEN:bug#70158; Package guix-patches.
Full text available.
Received: (at 70158) by debbugs.gnu.org; 3 Apr 2024 06:25:46 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Apr 03 02:25:45 2024
Received: from localhost ([127.0.0.1]:56845 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rru49-0004bN-JC
for submit <at> 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 <ngraves@HIDDEN>) id 1rru43-0004a5-J7
for 70158 <at> 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 <at> 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 <ngraves@HIDDEN>); Wed, 03 Apr 2024 06:25:33 +0000
Authentication-Results: garm.ovh; auth=pass
(GARM-102R004a6e52ff1-4fb9-4055-a4c0-e4049400aa3d,
50F27E84980287D69AF642A420FD808EB57BA51D) smtp.auth=ngraves@HIDDEN
X-OVh-ClientIp: 81.67.146.208
From: Nicolas Graves <ngraves@HIDDEN>
To: 70158 <at> debbugs.gnu.org
Subject: [PATCH 2/6] gnu: scilab: Sort dynamic_link deleted files.
Date: Wed, 3 Apr 2024 08:25:22 +0200
Message-ID: <20240403062528.5483-2-ngraves@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <20240403062528.5483-1-ngraves@HIDDEN>
References: <20240403062528.5483-1-ngraves@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Ovh-Tracer-Id: 17752345308968641250
X-VR-SPAMSTATE: OK
X-VR-SPAMSCORE: 0
X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvledrudeffedguddtjecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeelffejteeutefhfeekfffffedvudekjeekgfeludeitdfhkeevhfeivdfhffeggeenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddruddtvdenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepjedtudehkeesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekuddpmhhouggvpehsmhhtphhouhht
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 70158
Cc: ngraves@HIDDEN
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* gnu/packages/maths.scm (scilab):
[source]<origin>(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
--
2.41.0
guix-patches@HIDDEN:bug#70158; Package guix-patches.
Full text available.
Received: (at 70158) by debbugs.gnu.org; 3 Apr 2024 06:25:43 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Apr 03 02:25:42 2024
Received: from localhost ([127.0.0.1]:56841 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rru45-0004aT-23
for submit <at> 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 <ngraves@HIDDEN>) id 1rru42-0004a3-LH
for 70158 <at> 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 <at> 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 <ngraves@HIDDEN>); Wed, 03 Apr 2024 06:25:32 +0000
Authentication-Results: garm.ovh; auth=pass
(GARM-98R0028f788b5a-192a-465a-bb2b-4d3ec73c554e,
50F27E84980287D69AF642A420FD808EB57BA51D) smtp.auth=ngraves@HIDDEN
X-OVh-ClientIp: 81.67.146.208
From: Nicolas Graves <ngraves@HIDDEN>
To: 70158 <at> debbugs.gnu.org
Subject: [PATCH 1/6] gnu: scilab: Remove unecessary code.
Date: Wed, 3 Apr 2024 08:25:21 +0200
Message-ID: <20240403062528.5483-1-ngraves@HIDDEN>
X-Mailer: git-send-email 2.41.0
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Ovh-Tracer-Id: 17752063831935279842
X-VR-SPAMSTATE: OK
X-VR-SPAMSCORE: 0
X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvledrudeffedguddtjecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeekffegteffgfffjeegjedvfffgtddvueeutefgfeeuvdejgedvgeejjeevueeuveenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddrleeknecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeejtdduheekseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehjeeipdhmohguvgepshhmthhpohhuth
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 70158
Cc: ngraves@HIDDEN
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* 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")
--
2.41.0
guix-patches@HIDDEN:bug#70158; Package guix-patches.
Full text available.Received: (at submit) by debbugs.gnu.org; 3 Apr 2024 06:22:14 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Wed Apr 03 02:22:14 2024 Received: from localhost ([127.0.0.1]:56834 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1rru0k-0004I6-EA for submit <at> debbugs.gnu.org; Wed, 03 Apr 2024 02:22:14 -0400 Received: from lists.gnu.org ([2001:470:142::17]:55450) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <ngraves@HIDDEN>) id 1rru0h-0004HB-LB for submit <at> debbugs.gnu.org; Wed, 03 Apr 2024 02:22:12 -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 <ngraves@HIDDEN>) id 1rru0X-0007q1-3t for guix-patches@HIDDEN; Wed, 03 Apr 2024 02:22:01 -0400 Received: from 9.mo581.mail-out.ovh.net ([46.105.60.248]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <ngraves@HIDDEN>) id 1rru0V-00049T-9b for guix-patches@HIDDEN; Wed, 03 Apr 2024 02:22:00 -0400 Received: from director6.ghost.mail-out.ovh.net (unknown [10.109.148.164]) by mo581.mail-out.ovh.net (Postfix) with ESMTP id 4V8ZQp67s1z1DMW for <guix-patches@HIDDEN>; Wed, 3 Apr 2024 06:21:54 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-f5ln4 (unknown [10.110.113.248]) by director6.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 75CB21FD25; Wed, 3 Apr 2024 06:21:54 +0000 (UTC) Received: from ngraves.fr ([37.59.142.103]) by ghost-submission-6684bf9d7b-f5ln4 with ESMTPSA id 3a7RHYL1DGYKpAQA9bldxw (envelope-from <ngraves@HIDDEN>); Wed, 03 Apr 2024 06:21:54 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-103G0056ff47a90-e801-4fb5-9153-19e7c9a8e1f4, 50F27E84980287D69AF642A420FD808EB57BA51D) smtp.auth=ngraves@HIDDEN X-OVh-ClientIp: 81.67.146.208 From: Nicolas Graves <ngraves@HIDDEN> To: guix-patches@HIDDEN Subject: [PATCH 0/6] Scilab: Fixup install of local Scilab packages. Date: Wed, 3 Apr 2024 08:21:46 +0200 Message-ID: <20240403062146.1652-1-ngraves@HIDDEN> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 17690702287762612962 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvledrudeffedguddtiecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeekffegteffgfffjeegjedvfffgtddvueeutefgfeeuvdejgedvgeejjeevueeuveenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddruddtfeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepghhuihigqdhprghttghhvghssehgnhhurdhorhhgpdfovfetjfhoshhtpehmohehkedupdhmohguvgepshhmthhpohhuth Received-SPF: pass client-ip=46.105.60.248; envelope-from=ngraves@HIDDEN; helo=9.mo581.mail-out.ovh.net X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: submit Cc: ngraves@HIDDEN X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -0.0 (/) This patch series brings a few changes forward for Scilab. Patches 1,2 and 4 are cleanup patches. Patches 3 and 5 are necessary to be able to have an error log when Scilab calls configure during installation of external scilab packages. Patch 6 fixes package installation for packages that have help included (currently requires java). Nicolas Graves (6): gnu: scilab: Remove unecessary code. gnu: scilab: Sort dynamic_link deleted files. gnu: scilab: Fixup badly-written compilerDetection.sh script. gnu: scilab: Simpler and more robust version setting. gnu: scilab: Improve compilerDetection.sh. gnu: scilab: Improve package management robustness in scilab-cli. gnu/packages/maths.scm | 20 +++++------ .../scilab-better-compiler-detection.patch | 36 +++++++++++++++++++ .../patches/scilab-tbx_build_help.patch | 36 +++++++++++++++++++ 3 files changed, 82 insertions(+), 10 deletions(-) create mode 100644 gnu/packages/patches/scilab-better-compiler-detection.patch create mode 100644 gnu/packages/patches/scilab-tbx_build_help.patch -- 2.41.0
Nicolas Graves <ngraves@HIDDEN>:guix-patches@HIDDEN.
Full text available.guix-patches@HIDDEN:bug#70158; Package guix-patches.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.