From 126a2e8cb45b797579876834a566cec51f4a16a8 Mon Sep 17 00:00:00 2001
From: Zheng Junjie <zhengjunjie@iscas.ac.cn>
Date: Wed, 4 Dec 2024 23:24:11 +0800
Subject: Partial revert "gnu: bootstrap: %bootstrap-glibc: Also fix libm.so."

This partially reverts commit 204fe1b1f05f4438d1cf72c568b45696e55e54c9.

This part accidentally triggered a world rebuild for non-x86 architectures.

Change-Id: I921984ef5eff58792ffc17b64675db6a8e79695c
---
 gnu/packages/bootstrap.scm | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm
index 226cf0804b..dcf385b03e 100644
--- a/gnu/packages/bootstrap.scm
+++ b/gnu/packages/bootstrap.scm
@@ -775,11 +775,14 @@ $out/bin/guile --version~%"
               (chmod "lib" #o755)
 
               ;; Patch linker scripts so they refer to the right file-names.
-              (substitute* ,(if (target-hurd64?)
-                                ''("lib/libc.so" "lib/libm.so")
-                                "lib/libc.so")
-                (("/[^ ]+/lib/(libc|libm|libh|ld)" _ prefix)
-                 (string-append out "/lib/" prefix)))))))))
+              ,(if (target-hurd64?)
+                   '(substitute* '("lib/libc.so" "lib/libm.so")
+                      (("/[^ ]+/lib/(libc|libm|libh|ld)" _ prefix)
+                       (string-append out "/lib/" prefix)))
+                   '(substitute* "lib/libc.so"
+                      (("/[^ ]+/lib/(libc|ld)" _ prefix)
+                       (string-append out "/lib/" prefix))))
+              #t))))))
     (inputs
      `(("tar" ,(bootstrap-executable "tar" (%current-system)))
        ("xz"  ,(bootstrap-executable "xz" (%current-system)))
-- 
cgit v1.2.3

3d7435c13a8cb8ff4c'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/doc/images/coreutils-graph.dot'>
<input type='hidden' name='id' value='3545b0f9c3d0e80f2260513d7435c13a8cb8ff4c'/><input type='hidden' name='showmsg' value='1'/><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=3545b0f9c3d0e80f2260513d7435c13a8cb8ff4c&amp;showmsg=1'>root</a>/<a href='/guix/log/doc?id=3545b0f9c3d0e80f2260513d7435c13a8cb8ff4c&amp;showmsg=1'>doc</a>/<a href='/guix/log/doc/images?id=3545b0f9c3d0e80f2260513d7435c13a8cb8ff4c&amp;showmsg=1'>images</a>/<a href='/guix/log/doc/images/coreutils-graph.dot?id=3545b0f9c3d0e80f2260513d7435c13a8cb8ff4c&amp;showmsg=1'>coreutils-graph.dot</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/doc/images/coreutils-graph.dot?id=3545b0f9c3d0e80f2260513d7435c13a8cb8ff4c'>Collapse</a>)</th><th class='left'>Author</th></tr>
<tr class='logheader'><td><span title='2024-04-14 10:29:07 +0200'>2024-04-14</span></td><td class='logsubject'><a href='/guix/commit/doc/images/coreutils-graph.dot?id=076670f7acb740e2bfbd8e3c8ef1be5221ed75c5'>doc: Use "dejavu sans" instead of "Helvetica" or "sans" in dot images.</a></td><td>Janneke Nieuwenhuizen</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
Font-dejavu is (now) an input of fontconfig.  Specifying "dejavu sans" makes
generated images reproducible even when other fonts are installed (notably
font-google-noto).

* doc/images/bootstrap-graph.dot,
doc/images/bootstrap-packages.dot,
doc/images/coreutils-bag-graph.dot,
doc/images/coreutils-graph.dot,
doc/images/gcc-core-mesboot0-graph.dot,
doc/images/service-graph.dot,
doc/images/shepherd-graph.dot: Use fontname = "dejavu sans".
* doc/guix.texi (Full-Source Bootstrap): Update gcc-core-mesboot0.dot recipe
accordingly.

Change-Id: If21d7d39d45c66de5bceafb7b825a057d540ee50


</td></tr>