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 OA0YFqGHUGf4twAAe85BDQ:P1 (envelope-from ) for ; Wed, 04 Dec 2024 16:47:29 +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 OA0YFqGHUGf4twAAe85BDQ (envelope-from ) for ; Wed, 04 Dec 2024 17:47:29 +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=v7RfCXM2; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=kIfOVvem; 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=1733330849; a=rsa-sha256; cv=none; b=i/Q0/0tbkd2FlsqvfRhOg5qfqg+39WMSUoMCjH+XZMn9o7+VOdCQf1RikkuY6+PcMSmZ8z 7/wlTaG+BGx1Vm6VajZlk7D5OJMAH0zdbvXKbZZxc3eyX9Z6Pd80ycReyJ75IaueNgU6dv /fcM98wVeJMrVRqgGwOeYAQ18/X+60JC1cfIGs553aCMWChxixLccTV8crH2Y4CYzC54GH tuTmq5fUCO9JZyPRZx5jK5DdT3cgjgxXja9wyZHpyMMwQOILgvy5MfiyZ2KYWAm6ankF7O pADybnvAndMzTzJ5ACMjV29y2wHR6yYTBrSxp7R3k3CqJIaNEqqMyCIlPRAJhw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=v7RfCXM2; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=kIfOVvem; 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=1733330849; 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=H9ErpPUIotzcsAMArAq7E5kbUZ2OCiSNh6jUELcFXVM=; b=l5gFr+wXvdup2Xrjs9UTJrCQj8g6E7yG8Cykoh9qGSycK+J+8vjRSfIjWpnom1+QQCMv5R Tafkqkw7YzEiao90EVIzofojKPXTgQeFEyYJdve2SwkNM+FhY+tvVUxZ54ypKeMXk7i7xH bgF9yXfUI6vpXleTYhhyBMe8ePyGdqebCOLmNHjdwR9uRcwW4KskU0kLkIFNxRnubG3pC1 v7aZX0p5Ul1k+DQ8QYqeshyqiiWvxtnGvOtRlGS/mRGrTL/3Bs9SBbSD0BmtlT/FPY+u/Q uYKeAon+vWCXm0B/+IyUQ4dT3lEJBKuO10mVzAqV3nVFujmVSJi5XCuehNeoUg== 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 EC58165DF2 for ; Wed, 04 Dec 2024 17:47:28 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tIsWq-0005uI-AD; Wed, 04 Dec 2024 11:47:08 -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 1tIsWk-0005te-HW for guix-patches@gnu.org; Wed, 04 Dec 2024 11:47: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 1tIsWk-0000L3-9s for guix-patches@gnu.org; Wed, 04 Dec 2024 11:47: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=H9ErpPUIotzcsAMArAq7E5kbUZ2OCiSNh6jUELcFXVM=; b=v7RfCXM2OXdeW7s759KMrxPfO4pv4E8nF6z5R42WcceTxNoIhYGW6Tb2ilvvT6Rkxp4GC0BuQKFqx+NDpFiU48Xyr5w7tytxRdjMqZ+cqCfiSpeTadLbpmxp1aEyyBAK92VdxwO2Cdm/72zaorxS3jvsFrhzlDmR9JxXlKAziJy3kTYbrq1wwmu2pY0I/X8iF9gQOXwzOwVM+vfw3FHO1PUO21Ez228HSingUEbw0QAij6Av/RMpPenxNUA1njPjJp3d1lMOKEg4gvOAjPVtOZoJt38i0uPwIVRFZaKKVDmB1dSitVTrc8p90a/4PlJE9c0/5eTx8nDVKpxbBHgouw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tIsWj-00034Q-UQ for guix-patches@gnu.org; Wed, 04 Dec 2024 11:47:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74689] [PATCH 3/3] Partial revert "gnu: bootstrap: %bootstrap-gcc: Also wrap g++ 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:47: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.173333081311782 (code B ref 74689); Wed, 04 Dec 2024 16:47:01 +0000 Received: (at 74689) by debbugs.gnu.org; 4 Dec 2024 16:46:53 +0000 Received: from localhost ([127.0.0.1]:36529 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tIsWa-00033y-Ls for submit@debbugs.gnu.org; Wed, 04 Dec 2024 11:46:53 -0500 Received: from eggs.gnu.org ([209.51.188.92]:42130) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tIsWZ-00033h-1c for 74689@debbugs.gnu.org; Wed, 04 Dec 2024 11:46:51 -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 1tIsWN-0000Fw-HL; Wed, 04 Dec 2024 11:46:44 -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=H9ErpPUIotzcsAMArAq7E5kbUZ2OCiSNh6jUELcFXVM=; b=kIfOVvemarDPWAAI3JoO stFwxbnvdChVkiICX56I64syoQJyJtlwYdONfNqySi4GASFHi91IDBBL74u5yWrs8IhFwnugl6rrO qrdw2bW/Cb44MaaO7U2/g2l9I2jqAZjIVj+PoVs4cDMngoG/qdoDyJ6Ktj50iTNwvol4Lfd5rfAU5 IRE3Bher/7i2eiXgBk/eGJlS+12jwxqpxklEIXK8nt2npnNd8a8gMlL4FAB1+88SbEYSyhkelrePW Ko1EpoLGXKi7PxkwgdRIeG8Ugt5meFyy59mwNf9Glz9q7/g2iON0/JHL++3kTXQ/VnlhNHA5wmdG7 0hdccaJYZAcebg==; From: Janneke Nieuwenhuizen In-Reply-To: (Zheng Junjie's message of "Thu, 5 Dec 2024 00:13:29 +0800") Organization: AvatarAcademy.nl References: X-Url: http://AvatarAcademy.nl Date: Wed, 04 Dec 2024 17:46:34 +0100 Message-ID: <87zflbbdlh.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-Spam-Score: -4.55 X-Spam-Score: -4.55 X-Migadu-Queue-Id: EC58165DF2 X-Migadu-Scanner: mx12.migadu.com X-TUID: hZiOA0Gn1KfR Zheng Junjie writes: > This reverts partial commit 877b925df16740f9419d165d39cb7f191a86d5d1. > > This part accidentally triggered a world rebuild for non-x86 architecture= s. > > Change-Id: Iabc5422bb0e2bb37816ad437994af94d04830cb0 > --- > gnu/packages/bootstrap.scm | 43 +++++++++++++++++++++++++------------- > 1 file changed, 28 insertions(+), 15 deletions(-) > > diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm > index ccab43fb2c1..9046aaf6721 100644 > --- a/gnu/packages/bootstrap.scm > +++ b/gnu/packages/bootstrap.scm > @@ -875,20 +875,22 @@ (define %bootstrap-gcc > (let ((builddir (getcwd)) > (bindir (string-append out "/bin"))) >=20=20 > - (define (wrap-program program) > - (let ((wrapped (format #f ".~a-wrapped" program))) > - (rename-file program wrapped) > - (call-with-output-file program > - (lambda (p) > - (format p "#!~a > + ,@(if (target-hurd64?) > + '((define (wrap-program program) > + (let ((wrapped (format #f ".~a-wrapped" program))) > + (rename-file program wrapped) > + (call-with-output-file program > + (lambda (p) > + (format p "#!~a > exec ~a/bin/~a -B~a/lib \ > -Wl,-rpath -Wl,~a/lib \ > -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" > - bash > - out wrapped > - libc libc libc > - ,(glibc-dynamic-linker))))) > - (chmod program #o555)) > + bash > + out wrapped > + libc libc libc > + ,(glibc-dynamic-linker))))) > + (chmod program #o555))) > + '()) >=20=20 > (with-directory-excursion out > (invoke tar "xvf" > @@ -896,10 +898,21 @@ (define %bootstrap-gcc >=20=20 > (with-directory-excursion bindir > (chmod "." #o755) > - (for-each wrap-program > - ,(if (target-hurd64?) > - ''("gcc" "g++") > - ''("gcc"))))))))) > + ,@(if (target-hurd64?) > + `((for-each wrap-program '("gcc" "g++"))) > + `((rename-file "gcc" ".gcc-wrapped") > + (call-with-output-file "gcc" > + (lambda (p) > + (format p "#!~a > +exec ~a/bin/.gcc-wrapped -B~a/lib \ > + -Wl,-rpath -Wl,~a/lib \ > + -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" > + bash > + out libc libc libc > + ,(glibc-dynamic-linker)))) > + > + (chmod "gcc" #o555) > + #t)))))))) > (inputs > `(("tar" ,(bootstrap-executable "tar" (%current-system))) > ("xz" ,(bootstrap-executable "xz" (%current-system))) LGTM! I guess we want to revert these again on core-packages-team? --=20 Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar=C2=AE https://AvatarAcade= my.com