From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 QFDbKqTmQmdwVgAAe85BDQ:P1 (envelope-from ) for ; Sun, 24 Nov 2024 08:41:08 +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 QFDbKqTmQmdwVgAAe85BDQ (envelope-from ) for ; Sun, 24 Nov 2024 09:41:08 +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=Ln47Ngd2; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=iOmJaO2+; 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=1732437668; a=rsa-sha256; cv=none; b=d4mxdBgk6hABa405e/GjGJvU5pJ2HqqKEJ/6BxPVX15IHOH57UdeszVIpXlslSBxvPkBqn wUNX3z42Ls9186RrqtazEgR7xSHgNl7GDbsfRSHNBz9Ke1RAy0fbym8FK5VMyr24gIe2Qb 0L0Q4WSz4Vkkh2u7n15Qt2w32Nr2/Vo4qhjmaA10cbmEqJA1jiepBBwR0Nx6bKlk/c6zI8 9BryTB94trVQ0u6+UEcPub7ktL1BaxHhvFKS3aeVHDWDPtXxPO3q0EzuY4ovSH/Be1Dqgo MBwbL/6NDBCHlOW+B7BiyzSThiewr+koBEd2gM81ry4QkzGJ/GkJb35vzXjHtQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=Ln47Ngd2; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=iOmJaO2+; 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=1732437668; 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=FXMD9GV/IDot3mzzjW3SK8SDf2NubyYH9wWTmzicXzE=; b=JLlsc3TlCWFE03UJXnLPc9+s00KVMWV/1rnIS/EgSQ2FJubsdacVo1z+p4ZqndZpapUFf4 uGoM2yj9nKL+zTkY9y48y8DicaRzHrqSzunoe4h3qjs7lI2aW8zqYvzAqLujWbDpaauRrk rYCyjD3+6/TRImZ4Y1xk2UC1sFHcOUUKSOJDBtsUd6hcW19jIbUDjJputE5+tf31qFnIXm U6bE4LQMvRjXZ6VDn9z4qR5Jp9jiNYtA5i7QpbNRwQJGTFMIYOqVHXy3Rtj+Oofz5DmKPB nNVRLjURsoRdUeJrONcWjZztB7JUJ9s15mFDbEAHGx0f3p14syoE1iQIIQRS1g== 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 535304F64 for ; Sun, 24 Nov 2024 09:41:08 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tF7VN-0000sL-B5; Sun, 24 Nov 2024 02:58:05 -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 1tF7Uq-0000T6-Q7 for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:34 -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 1tF7Up-0002RO-MP; Sun, 24 Nov 2024 02:57:32 -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=FXMD9GV/IDot3mzzjW3SK8SDf2NubyYH9wWTmzicXzE=; b=Ln47Ngd23mrH009mkRwf4mx+BLslOYl4oxvUu5gSqcHERGkxuTrB3+59YrXZ1hQmvXzdq91h5n6vk93XdAa7lizGH/+C17vrBhcrQbr8By1ddT/KBjyRHfqyb39bv3uKowcfnXOYLYaN935ubakheftXO+WOZsD3e0yv7jqclp5MHHK1ExBlkana/6Wj1zH9RA0JgwW6Ace52oLjKYIZZmEy9MYwHfq211So2A4uyZgbXFShsSQGowWXFMoaxjf+Aj16zWnqaiDy/5nF0zSzX6CuZHxHXMOEy04/vceZ7Pz5jUbh8XU2MWhly2RFT+l0fEhybor7xDkK3osQgxXFPg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tF7Up-0004o9-Gn; Sun, 24 Nov 2024 02:57:31 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 49/58] 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: Sun, 24 Nov 2024 07:57:31 +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?Court=C3=A8s?= Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243504018288 (code B ref 74290); Sun, 24 Nov 2024 07:57:31 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:57:20 +0000 Received: from localhost ([127.0.0.1]:60882 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7Ue-0004ki-8X for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:57:20 -0500 Received: from eggs.gnu.org ([209.51.188.92]:33714) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7UC-0004ci-M2 for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:53 -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 1tF7U7-0002IM-Fs; Sun, 24 Nov 2024 02:56:47 -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=FXMD9GV/IDot3mzzjW3SK8SDf2NubyYH9wWTmzicXzE=; b=iOmJaO2+fZ4oFUVnOIin b6I9y+vjyISfcBJTLJTDZsDlpEQX3vY5LrI5R1umGCm8wFJ6fg4wOz9TVs3mJUEoyoHB3qOi/gRZI dlaGFXKPDys1Zb6NTz+zASHjzzWdtMCRRmbGnAdwczvbmXGeIUWGxS+Yiyw2QkLzckOjSN1Vk501Q ssZ1vkpmY0gPhlkpK6ZAG/VxTcWDXHIAMfaa+hadkGrQM0UaRe4bfzAOhQZaJJil8KIBdG/RkZvcd lxFPfYqFWq52Fgkr/gnADm8KjfdFUqo44znmBgpZzdI34ATbOYjkdqWv741olZX1IlIlLuXtp7dH6 DA4qOZgnCAXS/w==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:55:12 +0100 Message-ID: <4d1ee77ec4b095207612b6c62baf0d7396d2f3f8.1732434271.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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: -3.03 X-Spam-Score: -3.03 X-Migadu-Queue-Id: 535304F64 X-Migadu-Scanner: mx12.migadu.com X-TUID: NLKBJVR/DR38 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: I878e63d18f1012b6e186e90eb68cb97bec5ae94c --- 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 8027918323..a6cdda2122 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") + "lib/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