From 877b925df16740f9419d165d39cb7f191a86d5d1 Mon Sep 17 00:00:00 2001
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Tue, 19 Nov 2024 20:20:50 +0100
Subject: gnu: bootstrap: %bootstrap-gcc: Also wrap g++ for the 64bit Hurd.

* gnu/packages/bootstrap.scm (%bootstrap-gcc)[arguments] When building for
thee 64bit Hurd have the #:builder also wrap g++.

Co-authored-by: Efraim Flashner <efraim@flashner.co.il>

Change-Id: I2cdbc6837e1c451f108b309f2608240a7f57b82c
---
 gnu/packages/bootstrap.scm | 35 +++++++++++++++++++++--------------
 1 file changed, 21 insertions(+), 14 deletions(-)

(limited to 'gnu/packages/bootstrap.scm')

diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm
index a6cdda2122..48c7b42cc9 100644
--- a/gnu/packages/bootstrap.scm
+++ b/gnu/packages/bootstrap.scm
@@ -866,29 +866,36 @@ $out/bin/guile --version~%"
                (tarball (assoc-ref %build-inputs "tarball")))
 
            (mkdir out)
-           (copy-file tarball "binaries.tar.xz")
+           (copy-file tarball "binaries.tar.xz") ;avoid: more than one hard link
            (invoke xz "-d" "binaries.tar.xz")
            (let ((builddir (getcwd))
                  (bindir   (string-append out "/bin")))
+
+             (define (wrap-program program)
+               (let ((wrapped (format #f ".~a-wrapped" program)))
+                 (rename-file program wrapped)
+                 (call-with-output-file program
+                   (lambda (p)
+                     (format p "#!~a
+exec ~a/bin/~a -B~a/lib \
+     -Wl,-rpath -Wl,~a/lib \
+     -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
+                             bash
+                             out wrapped
+                             libc libc libc
+                             ,(glibc-dynamic-linker)))))
+               (chmod program #o555))
+
              (with-directory-excursion out
                (invoke tar "xvf"
                        (string-append builddir "/binaries.tar")))
 
              (with-directory-excursion bindir
                (chmod "." #o755)
-               (rename-file "gcc" ".gcc-wrapped")
-               (call-with-output-file "gcc"
-                 (lambda (p)
-                   (format p "#!~a
-exec ~a/bin/.gcc-wrapped -B~a/lib \
-     -Wl,-rpath -Wl,~a/lib \
-     -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
-                           bash
-                           out libc libc libc
-                           ,(glibc-dynamic-linker))))
-
-               (chmod "gcc" #o555)
-               #t))))))
+               (for-each wrap-program
+                         ,(if (target-hurd64?)
+                              ''("gcc" "g++")
+                              ''("gcc")))))))))
     (inputs
      `(("tar" ,(bootstrap-executable "tar" (%current-system)))
        ("xz"  ,(bootstrap-executable "xz" (%current-system)))
-- 
cgit v1.2.3

00 -0500'>2021-12-18</span></td><td><a href='/guix/commit/gnu/packages/spreadsheet.scm?id=fcb5b3176c7e752f3ed7816588973a47abcdc304'>gnu: visidata: Update to 2.8.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/spreadsheet.scm (visidata): Update to 2.8.
[inputs, native-inputs]: Migrate inputs to new style.

Signed-off-by: Leo Famulari &lt;leo@famulari.name&gt;
</span></span></td><td>Ryan Prior</td></tr>
<tr><td><span title='2021-12-13 17:48:25 +0100'>2021-12-13</span></td><td><a href='/guix/commit/gnu/packages/spreadsheet.scm?id=8394619baceb118df92e355377fd543bb1aa501a'>gnu: Simplify package inputs.</a><span class='msg-avail'>...<span class='msg-tooltip'>This commit was obtained by running:

  ./pre-inst-env guix style

without any additional argument.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2021-11-22 16:16:28 -0500'>2021-11-22</span></td><td><a href='/guix/commit/gnu/packages/spreadsheet.scm?id=10fad03fcf6fdd2edbdab5f939e3c0edb11a88e2'>gnu: Move visidata to (gnu packages spreadsheet).</a><span class='msg-avail'>...<span class='msg-tooltip'>See &lt;http://issues.guix.gnu.org/47852&gt;.

* gnu/packages/visidata.scm (visidata): Move from here…
* gnu/packages/spreadsheet.scm (visidata): …to here.
* gnu/local.mk (GNU_SYSTEM_MODULES): Adjust accordingly.

Signed-off-by: Leo Famulari &lt;leo@famulari.name&gt;
</span></span></td><td>Jorge Gomez</td></tr>
<tr><td><span title='2021-11-22 16:16:25 -0500'>2021-11-22</span></td><td><a href='/guix/commit/gnu/packages/spreadsheet.scm?id=c4bc557c3a2e59b0d127f1a8a963e1a19daf6cdb'>gnu: Add sc-im.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/spreadsheet.scm: New file.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add it.

Signed-off-by: Leo Famulari &lt;leo@famulari.name&gt;
</span></span></td><td>Jorge Gomez</td></tr>