From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id GNt9IAGMUGcDcgEAqHPOHw:P1 (envelope-from ) for ; Wed, 04 Dec 2024 17:06:09 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id GNt9IAGMUGcDcgEAqHPOHw (envelope-from ) for ; Wed, 04 Dec 2024 18:06:09 +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=eCDKBM9M; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=lXoEEukE; 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=1733331969; a=rsa-sha256; cv=none; b=Mvt5lBX8zIqmd6sv3SeIMi9i2YDaGIwwdk5IXLMAVYuKgF+f+F3xk/LIfYo3wrb8l+h0VS +JSAXwXBo7H/RoASRKMD/grilzktlMNJjSiksY4mXxhPDRMsNqaiTVHnO/RXO0eAUp8a54 XtvfzTO6uwbDgBDNXk6X3X/oDdTGYxkvUZ/plKu4yK83Z1ooJZmXtoYTvpF06zdRPvisva FJbGt4T572f9eC++YZh91NYssPK3WB0s+NJeQPUlD43RqlkmLR9B6g4tsNNy1vi327/Qai SIia9tFWV82hqm87pYr1Vpotdzc7CCHeH0n8F40bgYVIR+PYVJ0KHWCDMal76Q== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=eCDKBM9M; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=lXoEEukE; 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=1733331969; 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=umglNaDY9DFQG4nXYWoVSBczHainWtE1Jh3jPQh5we8=; b=R05eHCvcQ/sZ3d3oE9X/5oKCwHaFbsCyTAOYsOdFGSe1h/hbFLUTKXdoNSJwX96Vg3x1NF 5x+e2uuR3CzxfigXDeBYYXdDbLsSDCDWUmA4SHUkC5IU8idyBf96uOqV6X+yxiXi8mywuq fkNSiKbJXEsz/e8G+CFfOkkOTL1AWDXeLI6bFict4Msbj6t6t+o1bZsg31dYBjEpD4WS4k pQZfm49uPUJI0dbR57xVnMEFFMCWQhOGKq1XJKgPhuBmQaNtiJi+ZM1xyCB7NV/3yceZm5 //kjBYn5QMAd6zvzCJXOvmIDeOwsQWxTERvcet/l2ra8kpK51ZFLOFEFsP9NLw== 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 DEB737E2F5 for ; Wed, 04 Dec 2024 18:06:08 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tIspB-0002MR-5h; Wed, 04 Dec 2024 12:06: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 1tIsp8-0002FM-Iq for guix-patches@gnu.org; Wed, 04 Dec 2024 12:06: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 1tIsp8-0001z6-3e for guix-patches@gnu.org; Wed, 04 Dec 2024 12:06: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=umglNaDY9DFQG4nXYWoVSBczHainWtE1Jh3jPQh5we8=; b=eCDKBM9MqIXK6R6lvZYGNyzKzdAdUHep/MWCFkBmCgW/ydIRkARQWbdzELilcCOMRDDzfxFnzBTkU/Osv+uA/v4uUg5YsrRgul3qUeVwe+i24JeSaJMKCzYmsBTEWx3bRKlNrV8e9Hzq2BzSrnh/t9uDls7BDwUxWjJTSRuumOTzDViQ0Pol+3ejMk+bSzrrFsPjiqP+t4TCTpSw3ZwI8OdfAc/Iicz1u7XJ5/Bpdb52TBmrdTM83iwSpd1lBrsFRHh8L5rnOwlfXyfzQ6jDVmwyvDNdxFZDYL9C6Jo2kh5We1y2f/tynxJRlFdf90N2xr6G6hPmg/bfemofCrxSsQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tIsp7-000447-UU for guix-patches@gnu.org; Wed, 04 Dec 2024 12:06:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74689] [PATCH v2 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 17:06: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.173333193715579 (code B ref 74689); Wed, 04 Dec 2024 17:06:01 +0000 Received: (at 74689) by debbugs.gnu.org; 4 Dec 2024 17:05:37 +0000 Received: from localhost ([127.0.0.1]:36585 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tIsoi-00043C-U6 for submit@debbugs.gnu.org; Wed, 04 Dec 2024 12:05:37 -0500 Received: from eggs.gnu.org ([209.51.188.92]:47496) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tIsog-00042q-KZ for 74689@debbugs.gnu.org; Wed, 04 Dec 2024 12:05:35 -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 1tIsoX-0001Ts-Lv; Wed, 04 Dec 2024 12:05: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=umglNaDY9DFQG4nXYWoVSBczHainWtE1Jh3jPQh5we8=; b=lXoEEukEMSukj4beSYB7 EG+/oE8owkpnExDLPAudUGihmEhtbi2sYxaqJt2u9RMoNGksYWVG+9IeSYAY8Y2O4YgmTM72cy4RF hNXu/kI2N4FaGRO256DjM9sTme8fW9ZaC/TMQUFcYkOBAXT9GWk5BAxzNq3+Yj0iw8r90GUOFoto+ Jl5q5z0wkWe04TwSRwgpbUWCpp+a1ocAaf/MucXN+z4WqWGBEOKmFqfchvdoA0SfJgDwaHBQxIa2S BSZVRXUYFItOzSNGtbQvBi6jfqoyPzNebz4kidrK1PlphtuVkxZlV72LxEtxNrGkup+ENVZSrEVOM Wu/V3rS8ShGdvQ==; From: Janneke Nieuwenhuizen In-Reply-To: <564993090580244a965311b5bb510655a9f85d97.1733331428.git.zhengjunjie@iscas.ac.cn> (Zheng Junjie's message of "Thu, 5 Dec 2024 00:57:42 +0800") Organization: AvatarAcademy.nl References: <564993090580244a965311b5bb510655a9f85d97.1733331428.git.zhengjunjie@iscas.ac.cn> X-Url: http://AvatarAcademy.nl Date: Wed, 04 Dec 2024 18:05:08 +0100 Message-ID: <87ttbjbcqj.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-Spam-Score: -8.53 X-Spam-Score: -8.53 X-Migadu-Queue-Id: DEB737E2F5 X-Migadu-Scanner: mx10.migadu.com X-TUID: vTcEWE71gs2N Zheng Junjie writes: > This partially reverts commit ec8a5ec15f898e864705e5a5c834532e3fa8d0a4. > > This part accidentally triggered a world rebuild for non-x86 architecture= s. > > 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-bootstra= p.scm > index e0dcca7b33e..7e124f487ed 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}}") "}}") > + #$@(if (target-hurd64?) '() '(#t))))))))) I don't see how this would work for you, the #t ends up inside the (substitute ...), you want it outside, no? So, with this extra change: --8<---------------cut here---------------start------------->8--- diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.= scm index 7e124f487e..59c117f226 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -538,8 +538,8 @@ (define %gcc-static (substitute* (cons "gcc/config/rs6000/sysv4.h" (find-files "gcc/config" "^gnu-user.*\\.h$")) - ((" -lgcc_s}}") "}}") - #$@(if (target-hurd64?) '() '(#t))))))))) + ((" -lgcc_s}}") "}}")) + #$@(if (target-hurd64?) '() '(#t)))))))) (inputs `(("zlib:static" ,zlib "static") ("isl:static" ,isl "static") --8<---------------cut here---------------end--------------->8--- Other than this, LGTM --=20 Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar=C2=AE https://AvatarAcade= my.com