From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.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 WMcpJYyEUGdESwEAqHPOHw:P1 (envelope-from ) for ; Wed, 04 Dec 2024 16:34:20 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id WMcpJYyEUGdESwEAqHPOHw (envelope-from ) for ; Wed, 04 Dec 2024 17:34:20 +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=OVvMY1aV; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=l18WKPa7; 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=1733330060; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: 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=aVd8m0+wt6CDU8jt85EwyuAZxXdYoD+mk5wg+AwCGbU=; b=ZH5K4kDRLtTXBt6WR+3OM5pC5a52GzAEyZ9gT8F6DzzD2FSaK84/R/zsWzR3OPLiV9SXtQ l2/SQc1QG5UiSuKUcnVTWSKaPjW2ejr2aPhO4siZfoh2jBwWACoElWzxe4ICFlHBItcvs1 gQ39hc2fDKtBGu8pqdl8YDl6tnYtf/xyHmRZxAbnM8WDgXtoKMxszozwBMTi1X94f9Uhvc EgYYGpTYi8gDyE9S5gkCgunLCsc/ASgNj34SiQUda6ZZWou/g5LFN9oJZF/Zxg7cQSbBLG uuQyM50muQeI+mIxFKXyjf/2B2YZnbwLteqWuOg+87W7P9ipQWcQQ+Uioid6cg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=OVvMY1aV; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=l18WKPa7; 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=1733330060; a=rsa-sha256; cv=none; b=MugUteeReX8Shn0bmdQb2o4H8to9xD5u7QXUv8Elo1LMVLMAryIYFUJ2Vm9H4p7o2RS1vj vkl8655JD6o2YkGOlJuQXy4sQ6DJZHGPxy8XUPXqQNux1lOW6eHdnUN6Ccw9QAqZ4IBZ/H 5M/qfXUqjmcyyZTihjgPCtHad1nwn9C1H8wjzZcxb7IE/979vqKmPEFaLL42gecWgSoVjm C18WUMcMexD5+Nig5ZHmWBiebPLhPR0vc49a5IrF1DUwYrfoYaunhw9q8615+y9Knc9v+F 0wnmWX/O13PnSuzYAtHhdlH68VnyOyW7yP0mQI1sd4P8rs6GaX/z28vQ6vMoEw== 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 191928A23D for ; Wed, 04 Dec 2024 17:34:20 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tIsKB-0000na-QD; Wed, 04 Dec 2024 11:34:03 -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 1tIsKA-0000nR-Oj for guix-patches@gnu.org; Wed, 04 Dec 2024 11:34:02 -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 1tIsKA-0007Rx-G4 for guix-patches@gnu.org; Wed, 04 Dec 2024 11:34:02 -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:Date:References:In-Reply-To:From:To:Subject; bh=aVd8m0+wt6CDU8jt85EwyuAZxXdYoD+mk5wg+AwCGbU=; b=OVvMY1aV0AJF5bYD7OSUvpBxkDrCNMiEmSoKWqkCLz5eJmi0f+M4bOhXK8+pZHamTznVDR/CnhFN8ZTl4RRHSvNL1ny/IHpagyVUlG+0PBab0KNZa/pk/iqUD/+5S56Mxd0MkP8agcq2o3fi1ya2bb/EnmZW7yYP9KWiOlKK7POf510qUSHo7PX6XcoVJdt9rWGn0u45ok0yOdX1sYcaa1Y4bBzlwPNoJGsIcHBb3hogvSIShAxluDGp/cUdmOf0sTV9lwATMM+O9cMCpar2tH7CUqhksAr1EziZVKarejP6DHQQIyEQ0QRk/ke16Pe+W7bTaGb/YWGPa0UjKEeb+A==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tIsKA-0002PM-AG for guix-patches@gnu.org; Wed, 04 Dec 2024 11:34:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74689] [PATCH 2/3] Partial revert "gnu: bootstrap: %bootstrap-glibc: Also fix libm.so." Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 04 Dec 2024 16:34:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74689 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Zheng Junjie Cc: Andreas Enge , 74689@debbugs.gnu.org, Ludovic =?UTF-8?Q?Court=C3=A8s?= , Efraim Flashner Received: via spool by 74689-submit@debbugs.gnu.org id=B74689.17333300349235 (code B ref 74689); Wed, 04 Dec 2024 16:34:02 +0000 Received: (at 74689) by debbugs.gnu.org; 4 Dec 2024 16:33:54 +0000 Received: from localhost ([127.0.0.1]:36501 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tIsK2-0002Ot-B5 for submit@debbugs.gnu.org; Wed, 04 Dec 2024 11:33:54 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44618) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tIsJz-0002Oc-Qw for 74689@debbugs.gnu.org; Wed, 04 Dec 2024 11:33:52 -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 1tIsJt-0007NR-TD; Wed, 04 Dec 2024 11:33:45 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=aVd8m0+wt6CDU8jt85EwyuAZxXdYoD+mk5wg+AwCGbU=; b=l18WKPa7hhqXytR865LE i0+JLW2nfAZKoUXSx9jQCPQ/OXO6+1CuM+ZTnXY4MIgpvbcpDj+U1jAHUVb1STkFRbOgzjYpNeAUJ AFLqjwV1jMNBdUN0JOIMH3yL9HkZo8lizSLuqWXZfbkqFx2oWNfcY2WIv1qWzPZdKBwBXriHRCzRO tZEYa+MNTLjpXOAEJZh2ugIIpNzwqSQwrrYpsVcNIliwEMm8WiFZnydgceH9LxgUBQWrXUCQlm7CC 17q/V+K9+4426J4piTX00i9yigXa1y83WzLZmrcSUXGUVi0XvyeMXrAc1Uq0ekYQwK+7ph8XObyrd HSDCeCOhH8IzUw==; From: Janneke Nieuwenhuizen In-Reply-To: <9fed162df36c76cef39a2734baa71e34c98373c5.1733328333.git.zhengjunjie@iscas.ac.cn> (Zheng Junjie's message of "Thu, 5 Dec 2024 00:13:28 +0800") Organization: AvatarAcademy.nl References: <9fed162df36c76cef39a2734baa71e34c98373c5.1733328333.git.zhengjunjie@iscas.ac.cn> X-Url: http://AvatarAcademy.nl Date: Wed, 04 Dec 2024 17:33:42 +0100 Message-ID: <87cyi7csrd.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Scanner: mx11.migadu.com X-Migadu-Spam-Score: -4.55 X-Spam-Score: -4.55 X-Migadu-Queue-Id: 191928A23D X-TUID: YnhqLtMDcf/d Zheng Junjie writes: > This reverts partial commit 204fe1b1f05f4438d1cf72c568b45696e55e54c9. > > This part accidentally triggered a world rebuild for non-x86 architecture= s. @Efraim: Does this also trigger a world rebuild for you, I believe you looked at (some of these) patches for risc-v64? > Change-Id: I921984ef5eff58792ffc17b64675db6a8e79695c > --- > gnu/packages/bootstrap.scm | 14 +++++++++----- > 1 file changed, 9 insertions(+), 5 deletions(-) > > diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm > index 226cf0804bd..ccab43fb2c1 100644 > --- a/gnu/packages/bootstrap.scm > +++ b/gnu/packages/bootstrap.scm > @@ -775,11 +775,15 @@ (define %bootstrap-glibc > (chmod "lib" #o755) >=20=20 > ;; Patch linker scripts so they refer to the right file-na= mes. > - (substitute* ,(if (target-hurd64?) > - ''("lib/libc.so" "lib/libm.so") > - "lib/libc.so") > - (("/[^ ]+/lib/(libc|libm|libh|ld)" _ prefix) > - (string-append out "/lib/" prefix))))))))) > + ,(if (target-hurd64?) > + I think we don't need this newline? Otherwise, LGTM. > + '(substitute* '("lib/libc.so" "lib/libm.so") > + (("/[^ ]+/lib/(libc|libm|libh|ld)" _ prefix) > + (string-append out "/lib/" prefix))) > + '(substitute* "lib/libc.so" > + (("/[^ ]+/lib/(libc|ld)" _ prefix) > + (string-append out "/lib/" prefix)))) > + #t)))))) > (inputs > `(("tar" ,(bootstrap-executable "tar" (%current-system))) > ("xz" ,(bootstrap-executable "xz" (%current-system))) --=20 Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar=C2=AE https://AvatarAcade= my.com