all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Nicolas Graves via Guix-patches via <guix-patches@gnu.org>
To: 70158@debbugs.gnu.org
Cc: ngraves@ngraves.fr
Subject: [bug#70158] [PATCH 5/6] gnu: scilab: Improve compilerDetection.sh.
Date: Wed,  3 Apr 2024 08:25:25 +0200	[thread overview]
Message-ID: <20240403062528.5483-5-ngraves@ngraves.fr> (raw)
In-Reply-To: <20240403062528.5483-1-ngraves@ngraves.fr>

* 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@ngraves.fr>
+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





  parent reply	other threads:[~2024-04-03  6:26 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-04-03  6:21 [bug#70158] [PATCH 0/6] Scilab: Fixup install of local Scilab packages Nicolas Graves via Guix-patches via
2024-04-03  6:25 ` [bug#70158] [PATCH 1/6] gnu: scilab: Remove unecessary code Nicolas Graves via Guix-patches via
2024-04-03  6:25   ` [bug#70158] [PATCH 2/6] gnu: scilab: Sort dynamic_link deleted files Nicolas Graves via Guix-patches via
2024-04-03  6:25   ` [bug#70158] [PATCH 3/6] gnu: scilab: Fixup badly-written compilerDetection.sh script Nicolas Graves via Guix-patches via
2024-04-03  6:25   ` [bug#70158] [PATCH 4/6] gnu: scilab: Simpler and more robust version setting Nicolas Graves via Guix-patches via
2024-04-03  6:25   ` Nicolas Graves via Guix-patches via [this message]
2024-04-03  6:25   ` [bug#70158] [PATCH 6/6] gnu: scilab: Improve package management robustness in scilab-cli Nicolas Graves via Guix-patches via
2024-04-10  7:15 ` [bug#70158] [PATCH v2 1/3] gnu: scilab: Cleanup Nicolas Graves via Guix-patches via
2024-04-10  7:15   ` [bug#70158] [PATCH v2 2/3] gnu: scilab: Fixup and improve compilerDetection.sh script Nicolas Graves via Guix-patches via
2024-04-23 21:40     ` Nicolas Graves via Guix-patches via
2024-04-10  7:15   ` [bug#70158] [PATCH v2 3/3] gnu: scilab: Improve package management robustness in scilab-cli Nicolas Graves via Guix-patches via
2024-05-01 21:46   ` bug#70158: [PATCH v2 1/3] gnu: scilab: Cleanup Ludovic Courtès

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240403062528.5483-5-ngraves@ngraves.fr \
    --to=guix-patches@gnu.org \
    --cc=70158@debbugs.gnu.org \
    --cc=ngraves@ngraves.fr \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.