From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id 2MYlHX6GUGe9iwAAqHPOHw:P1 (envelope-from ) for ; Wed, 04 Dec 2024 16:42:38 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id 2MYlHX6GUGe9iwAAqHPOHw (envelope-from ) for ; Wed, 04 Dec 2024 17:42:38 +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=hnBRi3lX; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=KwVnL6OK; 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=1733330558; a=rsa-sha256; cv=none; b=FDuuNlDHYDyF0NZso76z924R/pRieFOTXKwryxjiMerAlrKZT/UegGFX5rNKPyKGucZ8+o 5xcXQAqnnwNCDP1MkD+wA1L76PbYpOLuMF7Op1zDu0kWKsAZe9d+2dMlNg9T0mNm6qseOM liyr2McmrZvNKsZ1CY/IeKRdEUGc2zpKomQ4QmBzmw9xesbvFAjXEpl4j7VNRMVjOzFo/J EX2pE5QYOFbVkIVBnNhOCXCrpk8oEirgIQXC5uPGM8dLIJ48TGIMo/MQPUAZb5u8OYTBOG OfpKSw0HC+cZCU5q61MHczdrNGaOUuPvzd1eiEpBRWJSB1Bw8vsLKBl/KdyYnA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=hnBRi3lX; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=KwVnL6OK; 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=1733330558; 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=VWxYfxG9hnuzZZ9VTTlQMWVJd8X8rCKMb2Ol8uIRffw=; b=s0Eu0F+tmA8Xz7GDVCQfkkMhMKlRQg/xHh815kxfxq6gYIOdwTCGI2Q8JpdETyw6Auk4Qb MyPM5z21gti09snRVAaoofSErB5bZglQkUpt1kgZm4X+ZbtO4cifVpV4K1c5FImaupGuCY SZTEj0Zg/s9TAbHNhC4wV805h2ORYXTA0fVT0k7IZ4XmLRVMs0zth5/AuCpBxZgPhDXZig u2l2SjuYNB2QkH3whk/qEdPfWtB6O2Ae7oYF+CvVFnNfLZNU571Q6KgLXr6ZP3nWuzPlWK 5db6e6XLFyCUh57P85GjjPWKjgsEw+JF3L5ytHFYb/KCSyOX3xKVIIir7KykUQ== 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 49A2154673 for ; Wed, 04 Dec 2024 17:42:38 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tIsSA-0004oo-Nd; Wed, 04 Dec 2024 11:42:18 -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 1tIsRv-0004li-An for guix-patches@gnu.org; Wed, 04 Dec 2024 11:42:03 -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 1tIsRv-000481-2S for guix-patches@gnu.org; Wed, 04 Dec 2024 11:42:03 -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=VWxYfxG9hnuzZZ9VTTlQMWVJd8X8rCKMb2Ol8uIRffw=; b=hnBRi3lX5t02DIQgucSzPdX7YDcz/+9MK5jYhq4DS/sub/YTyMC8uhDltfaEaT+Gn+LBFqEX516urZRlqwX2NoT7aV6CY8Ox8kmchAjBMSQs+p5nbYcgN2znPD52ajaiVIMMY7xpi0HZVmN6PIYNxymfMgpgFFCQMl2jK374FL8SsZelaDCO+1gYAYb0nWIukV+xfuJiTuuUtUuxr90dGKCPlISzPfg4/IOk2Cg5Cohcl8M+0k0md93VIzHu/DqAQWzqHqs3yFageCqoAGxVGDkfs7OhBwOuPm/6EzDf2zfov61u7njhmC8J/k4ye2u4dbluyKqJu+PdhjEPVL8ULQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tIsRt-0002pC-UR for guix-patches@gnu.org; Wed, 04 Dec 2024 11:42:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74689] [PATCH 1/3] Partial revert "gnu: make-bootstrap: Update gcc-static to gcc-14, for the 64bit Hurd." Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 04 Dec 2024 16:42:01 +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?= Received: via spool by 74689-submit@debbugs.gnu.org id=B74689.173333049710821 (code B ref 74689); Wed, 04 Dec 2024 16:42:01 +0000 Received: (at 74689) by debbugs.gnu.org; 4 Dec 2024 16:41:37 +0000 Received: from localhost ([127.0.0.1]:36519 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tIsRU-0002oR-Qy for submit@debbugs.gnu.org; Wed, 04 Dec 2024 11:41:37 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58460) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tIsRS-0002oC-76 for 74689@debbugs.gnu.org; Wed, 04 Dec 2024 11:41:36 -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 1tIsRL-0003rV-6i; Wed, 04 Dec 2024 11:41:27 -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=VWxYfxG9hnuzZZ9VTTlQMWVJd8X8rCKMb2Ol8uIRffw=; b=KwVnL6OKl+71KoE+FJ2d TEAeWddU95uRsbgQnTg+Qy71nPiqc+qa25M+Zrx7Po384bKGAQdkjFhhxggQrgimXZ9mJzcQD3FvN iqJNeDUGpZbqFQlM7DN7VBrgV2NOY/Npyt1VDMPyHVAd0O5nyhlOi0F/EfCMkcX9TICM9xcJRVT7A IgEBUpvkT+Jqs+h6sFL2b6Hrz7QZf8muznF0eKLPn605kajeDDWJZr/baPTFLz8WhTn+qtjg6qDRF /LsykTo/KDArtKLgkyzoTHjO7PXcurI2vD/64ERQADpFCG3ixzyxZK1x7MKE2BqdkrXxOKTtIQgaH 5JDoVC2c/0HvAg==; From: Janneke Nieuwenhuizen In-Reply-To: <87h67jcsvr.fsf@gnu.org> (Janneke Nieuwenhuizen's message of "Wed, 04 Dec 2024 17:31:04 +0100") Organization: AvatarAcademy.nl References: <87h67jcsvr.fsf@gnu.org> X-Url: http://AvatarAcademy.nl Date: Wed, 04 Dec 2024 17:40:58 +0100 Message-ID: <878qsvcsf9.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-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Queue-Id: 49A2154673 X-Migadu-Scanner: mx13.migadu.com X-Migadu-Spam-Score: -8.73 X-Spam-Score: -8.73 X-TUID: qxyoWd7npuvV Janneke Nieuwenhuizen writes: Hi > Zheng Junjie writes: > > Hello Zheng, > >> This reverts commit ec8a5ec15f898e864705e5a5c834532e3fa8d0a4. >> >> This part accidentally triggered a world rebuild for non-x86 architectur= es. >> >> Change-Id: Id2f9bcbcda8dc86ea407e9a7857a854dc1a742b5 >> --- >> gnu/packages/make-bootstrap.scm | 3 ++- >> 1 file changed, 2 insertions(+), 1 deletion(-) >> >> diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstr= ap.scm >> index e0dcca7b33e..d9c2f9bb827 100644 >> --- a/gnu/packages/make-bootstrap.scm >> +++ b/gnu/packages/make-bootstrap.scm >> @@ -538,7 +538,8 @@ (define %gcc-static >> (substitute* (cons "gcc/config/rs6000/sysv4.h" >> (find-files "gcc/config" >> "^gnu-user.*\\.h$")) >> - ((" -lgcc_s}}") "}}")))))))) >> + ((" -lgcc_s}}") "}}") >> + #t))))))) > > Running > > ./pre-inst-env guix build --target=3Dx86_64-pc-gnu bootstrap-tarballs --v= erbosity=3D2 > > > gives: > > /gnu/store/9qy13rlkrl9q7wpkvbvz9bi89z4d9csq-gcc-static-14.2.0-builder:1:8= 712: source expression failed to match any pattern in form (substitute* (co= ns "gcc/config/rs6000/sysv4.h" (find-files "gcc/config" "^gnu-user.*\\.h$")= ) ((" -lgcc_s}}") "}}") #t) > > The fix is trivial, the #t needs to go one level up....but it makes me > wonder: have you tested this patch, I'm wondering as to how this worked > to avoid a world rebuild to you? Doing it like this --8<---------------cut here---------------start------------->8--- diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.= scm index 879c123e81..59c117f226 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -539,7 +539,7 @@ (define %gcc-static (find-files "gcc/config" "^gnu-user.*\\.h$")) ((" -lgcc_s}}") "}}")) - #t)))))) + #$@(if (target-hurd64?) '() '(#t)))))))) (inputs `(("zlib:static" ,zlib "static") ("isl:static" ,isl "static") --8<---------------cut here---------------end--------------->8--- would be much preferable, as it doesn't force a rebuild of gcc-static for the 64bit Hurd. --=20 Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar=C2=AE https://AvatarAcade= my.com