From patchwork Tue Nov 19 06:55:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 70534 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 8446827BBEA; Tue, 19 Nov 2024 07:00:49 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 27AB727BBE2 for ; Tue, 19 Nov 2024 07:00:49 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) 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 ) 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 ) 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 ) 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 Original-Sender: "Debbugs-submit" 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: 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 , Ludovic =?utf-8?q?Court=C3=A8s?= X-Debbugs-Original-Xcc: Andreas Enge , Ludovic =?utf-8?q?Co?= =?utf-8?q?urt=C3=A8s?= 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 ) 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 ) 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 ) 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 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: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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)))