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

/guix/commit/gnu/packages.scm?id=237d90a7808cfdced34b34595eba16632cbcb89e'>commit</a><a href='/guix/diff/gnu/packages.scm?id=237d90a7808cfdced34b34595eba16632cbcb89e'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages.scm'>
<input type='hidden' name='id' value='237d90a7808cfdced34b34595eba16632cbcb89e'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=237d90a7808cfdced34b34595eba16632cbcb89e'>root</a>/<a href='/guix/log/gnu?id=237d90a7808cfdced34b34595eba16632cbcb89e'>gnu</a>/<a href='/guix/log/gnu/packages.scm?id=237d90a7808cfdced34b34595eba16632cbcb89e'>packages.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/packages.scm?id=237d90a7808cfdced34b34595eba16632cbcb89e&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2022-04-04 22:58:03 +0200'>2022-04-04</span></td><td><a href='/guix/commit/gnu/packages.scm?id=f54f2aa9df5047b348ca104f5145af50c1a482f6'>packages: Add 'package-unique-version-prefix'.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages.scm (package-unique-version-prefix): New procedure.
* guix/scripts/package.scm (manifest-entry-version-prefix): Use it.
* tests/packages.scm ("package-unique-version-prefix, gcc@8")
("package-unique-version-prefix, grep"): New tests.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2022-01-11 20:34:59 +0100'>2022-01-11</span></td><td><a href='/guix/commit/gnu/packages.scm?id=0552dcb294bbfed76d7a495f5e368c53f20b852a'>shell: Cache profiles even when using package specs.</a><span class='msg-avail'>...<span class='msg-tooltip'>This enables profile caching not just when '-m' or '-f' is used, but
also when package specs are passed on the command line, as in:

  guix shell -D guix git

It also changes profile cache keys to include the system type, which was
previously ignored.

* guix/scripts/shell.scm (options-with-caching)[single-file-for-caching]:
Remove.
Call 'profile-cached-gc-root' instead; adjust to accept two values.
(profile-cache-primary-key): New procedure.
(profile-cache-key): Remove.
(profile-file-cache-key, profile-spec-cache-key): New procedures.
(profile-cached-gc-root): Rewrite to include functionality formally in
'single-file-for-caching', but extend to handle package specs.
* gnu/packages.scm (cache-is-authoritative?): Export.
* guix/transformations.scm (transformation-option-key?): New procedure.
* doc/guix.texi (Invoking guix shell): Move '--rebuild-cache'
documentation to the bottom, just above '--root'.  Explain caching and
how these two options relate to that.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2020-07-30 19:17:20 +0200'>2020-07-30</span></td><td><a href='/guix/commit/gnu/packages.scm?id=a127e52f601ee73f675d5d28eac2388bb1ad11b0'>packages: 'generate-package-cache' is deterministic.</a><span class='msg-avail'>...<span class='msg-tooltip'>Fixes &lt;https://bugs.gnu.org/42009&gt;.
Reported by Marinus &lt;marinus.savoritias@disroot.org&gt;.

* gnu/packages.scm (generate-package-cache)[entry-key, entry&lt;?]
[variables]: New variables.
[expand-cache]: Change to take two arguments.
[exp]: Fold over VARIABLES.
</span></span></td><td>Ludovic Courtès</td></tr>