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 +