From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <guix-patches-bounces+larch=yhetil.org@gnu.org>
Received: from mp1.migadu.com ([2001:41d0:403:58f0::])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))
	by ms13.migadu.com with LMTPS
	id YI4bBRDlQmeAYwAA62LTzQ:P1
	(envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>)
	for <larch@yhetil.org>; Sun, 24 Nov 2024 08:34:24 +0000
Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))
	by mp1.migadu.com with LMTPS
	id YI4bBRDlQmeAYwAA62LTzQ
	(envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>)
	for <larch@yhetil.org>; Sun, 24 Nov 2024 09:34:24 +0100
X-Envelope-To: larch@yhetil.org
Authentication-Results: aspmx1.migadu.com;
	dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=iELUVdZf;
	dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=ptnbPd9Q;
	spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org";
	dmarc=pass (policy=none) header.from=gnu.org
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org;
	s=key1; t=1732437263;
	h=from:from:sender:sender:reply-to:subject:subject:date:date:
	 message-id:message-id:to:to:cc:cc:mime-version:mime-version:
	 content-transfer-encoding:content-transfer-encoding:resent-cc:
	 resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to:
	 references:references:list-id:list-help:list-unsubscribe:
	 list-subscribe:list-post:dkim-signature;
	bh=NrZ6SmZrq6SBxLSl282MRapZpzQdQyajdGWxYDjNIEc=;
	b=TdS3qMaaBBiORW+jD5uReuZRTLQZenc+iDyPhMZhi5RG9YfzVNWvmsmxiRMK6cjJzZpamA
	Snx3/iwf82LJdtEp3VGiexBlM5V7e+qa9cYRHiAJbolbQJR62pOyc0olOD/7lKNSki6l13
	+fR5e1LXDYY/MEnzcvxnngzbbv2rSvfOX+9Hwc4514Fk6fNZkD3TgwaHIsRJWEEjmtLoXM
	E8dkZxcqY9TC/CjfjNVd8u6GUQ0kJ3dHuMLbjUevOBXzJ7nF0UX3XQlW0pnaAFn/SSCnlG
	IIu3zMkfIHjIAwScMCbAj67s/QB0qLWgz4pT2oGJPabRYCVOoEIoMQ8UxIq/Lw==
ARC-Authentication-Results: i=1;
	aspmx1.migadu.com;
	dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=iELUVdZf;
	dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=ptnbPd9Q;
	spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org";
	dmarc=pass (policy=none) header.from=gnu.org
ARC-Seal: i=1; s=key1; d=yhetil.org; t=1732437263; a=rsa-sha256; cv=none;
	b=GtbzpsZxsdqSqOJ6t70tj0g5iMMTFgMkPSjm49j3gCIlWUlhZrtWKYqWm5Zjs2gUi1iVNZ
	NV/rMRYXcdCJaWkSBdPjXxZ25huKugQKWQqTEdRQEbJ4oh9eWh3AzMyNZ66R7xLtz9tZpQ
	MqGhTszgKPCvdWfcln9s2mmnoaEtYijnI4jd69MPkLqz9xWnhPPN7flHiOaFgnWELpwvBB
	sn4ruzyAF5wTLtzx3G3gIlSvjAm1iAoFO5y6os0FXIYCaYkbIpXl5c3HYAmzsjQMUt//qv
	SwTmBu7Moh2FhrNZiHbwu62w7eLN5PQLPZ7gqj9SLoPiaLHhn0hIcu7UCpCIZA==
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by aspmx1.migadu.com (Postfix) with ESMTPS id 98B127C06F
	for <larch@yhetil.org>; Sun, 24 Nov 2024 09:34:22 +0100 (CET)
Received: from localhost ([::1] helo=lists1p.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.90_1)
	(envelope-from <guix-patches-bounces@gnu.org>)
	id 1tF7Vz-0001h0-RE; Sun, 24 Nov 2024 02:58:44 -0500
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 <Debian-debbugs@debbugs.gnu.org>)
 id 1tF7Uu-0000Vf-MU
 for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:37 -0500
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 <Debian-debbugs@debbugs.gnu.org>)
 id 1tF7Us-0002Sd-Su; Sun, 24 Nov 2024 02:57:36 -0500
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
 d=debbugs.gnu.org; s=debbugs-gnu-org; 
 h=MIME-Version:References:In-Reply-To:Date:From:To:Subject;
 bh=NrZ6SmZrq6SBxLSl282MRapZpzQdQyajdGWxYDjNIEc=; 
 b=iELUVdZf7uexv1fheeZP5HHwNrFST9WN5cW0DVpxOrmax/yjkQEq5OaKlHlryw59BnKVVyiN1R6rDDMdxaGtAegskikFeiQuPAU9RSfk3vb5lp2HqDlIyV5KqvhGVUd6RJDnZvZAaR7KUzqd9pMJAWGT+Kez+Sz6G9RzdRGoGn89a8etik0Ouz+pL+R+OWrs/K5iZkeM/WaG0dMQhnaTMcu5mYKbSdRB8w92GylEr4oGFQSrB8A1kkKqVBfEQT2hmYwIaqm06zJrh2pVnsKboa9DxjV4/Nn6GcXaUT5z/7Uu8rrBFEVNtwTA2BJfiIWVtx22/b5aLRAE23cy02ndow==;
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1tF7Us-0004pA-Oi; Sun, 24 Nov 2024 02:57:34 -0500
X-Loop: help-debbugs@gnu.org
Subject: [bug#74290] [PATCH v4 55/58] gnu: bootstrap: %bootstrap-gcc: Also
 wrap g++ for the 64bit Hurd.
Resent-From: Janneke Nieuwenhuizen <janneke@gnu.org>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: andreas@enge.fr, ludo@gnu.org, guix-patches@gnu.org
Resent-Date: Sun, 24 Nov 2024 07:57:34 +0000
Resent-Message-ID: <handler.74290.B74290.173243504718404@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: followup 74290
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 74290@debbugs.gnu.org
Cc: Efraim Flashner <efraim@flashner.co.il>, Andreas Enge <andreas@enge.fr>,
 Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@gnu.org>
X-Debbugs-Original-Xcc: Andreas Enge <andreas@enge.fr>,
 Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@gnu.org>
Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243504718404
 (code B ref 74290); Sun, 24 Nov 2024 07:57:34 +0000
Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:57:27 +0000
Received: from localhost ([127.0.0.1]:60907 helo=debbugs.gnu.org)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
 id 1tF7Uk-0004mg-Uk
 for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:57:27 -0500
Received: from eggs.gnu.org ([209.51.188.92]:39160)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <janneke@gnu.org>) id 1tF7UI-0004dW-16
 for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:58 -0500
Received: from fencepost.gnu.org ([2001:470:142:3::e])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <janneke@gnu.org>)
 id 1tF7UC-0002J7-Qa; Sun, 24 Nov 2024 02:56:52 -0500
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
 s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To:
 From; bh=NrZ6SmZrq6SBxLSl282MRapZpzQdQyajdGWxYDjNIEc=; b=ptnbPd9Q/I6WJD6SpK6v
 I9OAlrQkChtTFSQsAUXA0XFSaq3D5ZCT+un5YLxDB2KNRqTiRNhZ5XBL8vSGmXnORnLARfr7NnBsM
 nBCrowGDRRLHYJMKQGLpgYb7XqCxuskrkqrO1EG32IPAiFe2/UYTssGZHePsBUBXoFfsk0CKCnERc
 b0Ug7u12ZjQtEALvk9mNsy8KTLf2HzeXoMYkUUuEdKJ7jyibuNAalENpshLqj4UshqiHYdp+UmnEU
 0WNGX2/kXe8+KdG0kqSIaOeW8oZYzcrAyql+VNhemz4gwagUqGsGz45eSvTPSFi6Equc/NlYzuFri
 /q/RZ0zbIrFpMQ==;
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Sun, 24 Nov 2024 08:55:18 +0100
Message-ID: <d737fb54e21f03833485c35e5dc2a3f96359d4aa.1732434271.git.janneke@gnu.org>
X-Mailer: git-send-email 2.46.0
In-Reply-To: <cover.1732434270.git.janneke@gnu.org>
References: <cover.1732434270.git.janneke@gnu.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-BeenThere: debbugs-submit@debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
X-BeenThere: guix-patches@gnu.org
List-Id: <guix-patches.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>,
 <mailto:guix-patches-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/guix-patches>
List-Post: <mailto:guix-patches@gnu.org>
List-Help: <mailto:guix-patches-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>,
 <mailto:guix-patches-request@gnu.org?subject=subscribe>
Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org
Sender: guix-patches-bounces+larch=yhetil.org@gnu.org
X-Migadu-Country: US
X-Migadu-Flow: FLOW_IN
X-Migadu-Scanner: mx11.migadu.com
X-Migadu-Spam-Score: -0.33
X-Spam-Score: -0.33
X-Migadu-Queue-Id: 98B127C06F
X-TUID: +WIzi79Qt/um

* 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(-)

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 @@ (define %bootstrap-gcc
                (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)))
-- 
2.46.0