From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <guix-patches-bounces+larch=yhetil.org@gnu.org>
Received: from mp2.migadu.com ([2001:41d0:303:e224::])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))
	by ms13.migadu.com with LMTPS
	id MGfeDKI3PGcefwAAe85BDQ:P1
	(envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>)
	for <larch@yhetil.org>; Tue, 19 Nov 2024 07:00:50 +0000
Received: from aspmx1.migadu.com ([2001:41d0:303:e224::])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))
	by mp2.migadu.com with LMTPS
	id MGfeDKI3PGcefwAAe85BDQ
	(envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>)
	for <larch@yhetil.org>; Tue, 19 Nov 2024 08:00:50 +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=VuPSVazd;
	dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=AgUysM2r;
	dmarc=pass (policy=none) header.from=gnu.org;
	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"
ARC-Seal: i=1; s=key1; d=yhetil.org; t=1731999649; a=rsa-sha256; cv=none;
	b=janfE25W/iPfOF8BLYZ75yLncsxJbn/AezGUzSNS6O4bzDu+06cYiD8IIzwSwNRmUYGT6E
	aQITbtBKuDhSTYJclel9i3X44m08wmg8jIWMj9PULQeM8qY2erYJ/m4m50Q50bibWoU53R
	2IDjRwVyt6eJWZ85vZAxYSz3E6dYLkbSc6fm3fFsqSof4ffAXTLb1bCG4p/MnOuSxYRIAq
	PxCUBDSiSFVyyyVikeRhm/fXkpcE2tvMqIPFDUoHPHCuawdqa6QbSA++Lbkyl3qFcqRBaJ
	CdL9xghmN2FKXfC5tdUB3RSz2AsaUNvwxIF8f/maRMTkS5aZs/0SLzW5IFxQ3g==
ARC-Authentication-Results: i=1;
	aspmx1.migadu.com;
	dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=VuPSVazd;
	dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=AgUysM2r;
	dmarc=pass (policy=none) header.from=gnu.org;
	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"
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org;
	s=key1; t=1731999649;
	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=e3AceFocsajaPJhd3KemYY4Gxg63jbUWxAzZc4texAU=;
	b=jJp8H4ZoZFahpIp0lzXVWOIvYb0imS7JVPbAyH36jhQKGi2Ih8unSKjHkxsfA0br6K/l/1
	u4HaV0CL4UOKjjC1rxKlgRiJAY+lXaZsvJGj4m0XzjKMU/XmkAVmyFR7PltSmF8AYhqTBr
	ndbVjwSHXcMYWQ8MebyjT0Utm/coRH99fwN9gEGVRIO5PrrNjdk8rmYgpQF6CUGG/iM7e2
	+y+pOYE3GPgMhAlzVy4526NQeYYgI+F12tGM8guEd+Ip+LgpBWAqjQuggm/Yxt+mh+wC4J
	JnmOngEbkrX9JuBqXDVwbuKKYfJ9nwE92YEkVVRWCysd7403YFCLn3BAy1gmjA==
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 D56018983E
	for <larch@yhetil.org>; Tue, 19 Nov 2024 08:00:49 +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 1tDIDa-0000nq-Cc; Tue, 19 Nov 2024 02:00:10 -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 1tDIDW-0000if-Ek
 for guix-patches@gnu.org; Tue, 19 Nov 2024 02:00:06 -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 1tDIDW-0004jS-2D; Tue, 19 Nov 2024 02:00:06 -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=e3AceFocsajaPJhd3KemYY4Gxg63jbUWxAzZc4texAU=; 
 b=VuPSVazd0ia5R9yUBs3Ab/gWigBqqUkjJlu787wVe1V9YpGPo650h0A30HMrNNwgqeHkVRzStqNuM5sTgLK4MEBq0/xijrCOdK1wrKwpUcqInmlSgPl84f82ZLk1famjQdaHlOFVrrveU/L7W+Nbm91nUl7/wXk1yqIhUKHinqLqZdHnmF+bvVcd3xKrBfa8aL7wx8K4ah7a1zOsDPn9nQFsZjLBLUQDq23MCJbdv6xXGWLd+T4xQ3BFE9KGjz1jSriXT3cod82Dy2qyLl6nPj30I3Hccl+Qt3yjtm0qQoDMVKDtgdsJ+B6mr2/tcAFXqIemGC/xY0MGHfx96OMw3Q==;
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1tDIDV-0005Og-SL; Tue, 19 Nov 2024 02:00:05 -0500
X-Loop: help-debbugs@gnu.org
Subject: [bug#74290] [PATCH v3 47/51] gnu: bootstrap: %bootstrap-glibc: Also
 fix libm.so.
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: Tue, 19 Nov 2024 07:00:05 +0000
Resent-Message-ID: <handler.74290.B74290.173199959020584@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: 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.173199959020584
 (code B ref 74290); Tue, 19 Nov 2024 07:00:05 +0000
Received: (at 74290) by debbugs.gnu.org; 19 Nov 2024 06:59:50 +0000
Received: from localhost ([127.0.0.1]:40659 helo=debbugs.gnu.org)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
 id 1tDIDG-0005Lq-7t
 for submit@debbugs.gnu.org; Tue, 19 Nov 2024 01:59:50 -0500
Received: from eggs.gnu.org ([209.51.188.92]:43486)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <janneke@gnu.org>) id 1tDICQ-0005CR-AX
 for 74290@debbugs.gnu.org; Tue, 19 Nov 2024 01:58:59 -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 1tDIAF-00046t-2i; Tue, 19 Nov 2024 01:56:43 -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=e3AceFocsajaPJhd3KemYY4Gxg63jbUWxAzZc4texAU=; b=AgUysM2r7HrX7ZXuDkj9
 po9yXnGSg7UfjBAZA92Uyd/0NyfIDOt1bLEbaR3IetUyr6SjN4ddbdOcDOn54Y7NeXD1zZd7AZJd9
 DNrHpm3fJndcKz/ERiQuSkudz26XQKojDP0wkDglz4hVbU7hTvnaD6MG+jXkgj/FNWd3sTzHvbvb9
 WJA8191YZmQMwLjSMWBPdkfOmnjljOBVvMkSt1gjpFLgTMZpC/q5necKIDtDVtuImKMQTD2tkz8aI
 QdVxrb2zXuqrAnb5KsJeQYhnZb/XIm00T2HELMKDKaBUrfaeYSn3MUvLusv7Vu0oIQZsM6GnyA/Ix
 Z1Kx6dWlu23pYw==;
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Tue, 19 Nov 2024 07:55:17 +0100
Message-ID: <2b945a5a46218b04a37eb9d01530e93baf00608d.1731999203.git.janneke@gnu.org>
X-Mailer: git-send-email 2.46.0
In-Reply-To: <cover.1731999202.git.janneke@gnu.org>
References: <cover.1731999202.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-Flow: FLOW_IN
X-Migadu-Country: US
X-Migadu-Spam-Score: -0.02
X-Spam-Score: -0.02
X-Migadu-Queue-Id: D56018983E
X-Migadu-Scanner: mx12.migadu.com
X-TUID: 9mRirvJoJ+B+

On the 64bit Hurd, glibc-2.39's libm.so is also a linker script.  This fixes
having it refer to

    /gnu/store/eee...-glibc-cross-x86_64-pc-gnu-2.39/lib/libm.so.6
    /gnu/store/eee...-glibc-cross-x86_64-pc-gnu-2.39/lib/libmvec.so.1

* gnu/packages/bootstrap.scm (%bootstrap-glibc)[arguments]: When building for
the 64bit Hurd, also substitute libm.so linker script.  Update the regexp to
also cater for libh[urduser] and libm[achuser].

Change-Id: I399d8f3ad9be6b8892955c2cbe59a10093120c77
---
 gnu/packages/bootstrap.scm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm
index 301ee3ca12..f8490ce56c 100644
--- a/gnu/packages/bootstrap.scm
+++ b/gnu/packages/bootstrap.scm
@@ -774,12 +774,12 @@ (define %bootstrap-glibc
                                      "/binaries.tar"))
               (chmod "lib" #o755)
 
-              ;; Patch libc.so so it refers to the right path.
-              (substitute* "lib/libc.so"
-                (("/[^ ]+/lib/(libc|ld)" _ prefix)
-                 (string-append out "/lib/" prefix)))
-
-              #t))))))
+              ;; Patch linker scripts so they refer to the right file-names.
+              (substitute* ,(if (target-hurd64?)
+                                ''("lib/libc.so" "lib/libm.so")
+                                "libc.so")
+                (("/[^ ]+/lib/(libc|libm|libh|ld)" _ prefix)
+                 (string-append out "/lib/" prefix)))))))))
     (inputs
      `(("tar" ,(bootstrap-executable "tar" (%current-system)))
        ("xz"  ,(bootstrap-executable "xz" (%current-system)))
-- 
2.46.0