From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.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 6BARI4WMUGeLfgEA62LTzQ:P1 (envelope-from ) for ; Wed, 04 Dec 2024 17:08:21 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id 6BARI4WMUGeLfgEA62LTzQ (envelope-from ) for ; Wed, 04 Dec 2024 18:08:21 +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=B7SEzY18; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=ad4xhf3w; 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=1733332101; a=rsa-sha256; cv=none; b=IOFgSBrR0CoSb7fG9nTVK7sYu7B+5MMbp/3/y+T/foi24JRW0gFQikavlZ+dOsmQZuqZTA gNo/BZNBflR9B/ykuLE6S9rpYMb+T6chyNwDfdNarwc0oK1/qewXaDa6I/9DDKp+YyOI3M UVXpvXY6NEDRyucsmiVLMjJI7qpWloVt/zydEK4OGOiLKFGavb19bij8jKaze3ImAGvnl7 2SWoD1u11K8YVaETYuFzfkuwbB1BguC9mP4dSr+5FA4V9Xm/ECE3chXYGLekzmrXLJ3b67 ojstEckYl3Sx08P/w8Qnfr/6FBEHHW37VmFudZuKd+8x9k4INO5mXkk7cSDQCg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=B7SEzY18; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=ad4xhf3w; 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=1733332101; 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=829xzwN7cMpD4g7ls7Y/oBwoyMuKRD02STDIHrUbn3U=; b=lF2jjMpzuA0P3wCuEGMuWULGrVrgM3VrfpADEmNPmbjhIV+Dpskl8yS78/62/i8j/4Jngu 9jcojRcSxZiLDZhsiWe3t1FyH+EDyCck0gBnqu+AiUUFR+yGfv3POmVYHYnfzk36605eas AZUnGYq2oFDct6QK4mcCAMzM+h6DZOUIlbCiRFyMiMo++39udc8/6nStAwREQXicW4SFfU uVPKgJqeoJHVz8I1CfWD0e9am2A5MwksWBhHWfK5Cy5SrnN+zB+EP5R9acZpQBzv3s7kev YVA2rBF2GLzlMCJRE2Jr/gz7XQJJMsAgj/CY5jgkQUFbdjKWX0EneHz9mCFsKg== 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 6411255E6E for ; Wed, 04 Dec 2024 18:08:21 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tIsr7-00035M-SH; Wed, 04 Dec 2024 12:08:06 -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 1tIsr5-00034t-LG for guix-patches@gnu.org; Wed, 04 Dec 2024 12:08: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 1tIsr4-0002Xd-Ey for guix-patches@gnu.org; Wed, 04 Dec 2024 12:08: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=829xzwN7cMpD4g7ls7Y/oBwoyMuKRD02STDIHrUbn3U=; b=B7SEzY182IUwm9T20pmbdWPG8d6JM9cWwEqcGkNpKdtln7TdRTIw4pOLK8KDKh/SEFoGWhl47WPrLhhpeYv9/wL3SsYPIJdmm1vDKo2yvcMfGQtS2A12v9rrIv+LbHGV7aagk6VPvVm6QbliS83NGoVxH1lLN0XB5tROoCdY7n7HxMmZRSwpiHMMC1vzNjC3M/PV3Blp3zB/uh9MCUPOi0m1PaisqiIo4BYqP+c5g4C9BYOsECpMPA3gErZmUTgc6ICFQ8AO/HYcDM0JW/HZZaGgo9rHHYxB8BHCghZep414hL31cgZpPfeIvAQw465F6qDNgt0UrJvSASCDvalvpg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tIsr4-00048d-99 for guix-patches@gnu.org; Wed, 04 Dec 2024 12:08:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74689] [PATCH v2 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 17:08: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?= Received: via spool by 74689-submit@debbugs.gnu.org id=B74689.173333205115851 (code B ref 74689); Wed, 04 Dec 2024 17:08:02 +0000 Received: (at 74689) by debbugs.gnu.org; 4 Dec 2024 17:07:31 +0000 Received: from localhost ([127.0.0.1]:36595 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tIsqZ-00047b-0k for submit@debbugs.gnu.org; Wed, 04 Dec 2024 12:07:31 -0500 Received: from eggs.gnu.org ([209.51.188.92]:42064) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tIsqW-00047G-3d for 74689@debbugs.gnu.org; Wed, 04 Dec 2024 12:07:28 -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 1tIsqQ-0002NE-Pq; Wed, 04 Dec 2024 12:07:22 -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=829xzwN7cMpD4g7ls7Y/oBwoyMuKRD02STDIHrUbn3U=; b=ad4xhf3wAejhFuyWyhAL kycBGRMmGuSsKUnjZpIC/cLERlq3jNT7Y2kagFdmWbUKoddnoOiFLK6Jr0Xbnohvd6og9uz+8NgdG WuuAJgF5rJnXdisXWGmM6EXfmuuuL8NshAGQclBSOXHFhdCgH5w3aYrPqGwTapqPkcOlW2BdmnUiH KGu5eUI/3fGoF23EdqEEOakLOazT8wgsl4N7+GYOh+GQaAPMS3KqojcENxO4yavKn8VuDnpvR7jBt KMopiViV0XZBmoDS1YQPtCwYAMeavEW/q3DhaVVB5Y5sfOrtBOh+nTPhUqFXvlAxoY0j/hHG5PuVg Xv2pflrP+e7tLA==; From: Janneke Nieuwenhuizen In-Reply-To: <0028b452cf4f37da502d786a9be69abeddb2c15c.1733331428.git.zhengjunjie@iscas.ac.cn> (Zheng Junjie's message of "Thu, 5 Dec 2024 00:57:44 +0800") Organization: AvatarAcademy.nl References: <564993090580244a965311b5bb510655a9f85d97.1733331428.git.zhengjunjie@iscas.ac.cn> <0028b452cf4f37da502d786a9be69abeddb2c15c.1733331428.git.zhengjunjie@iscas.ac.cn> X-Url: http://AvatarAcademy.nl Date: Wed, 04 Dec 2024 18:07:00 +0100 Message-ID: <87ldwvbcnf.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: 6411255E6E X-Migadu-Scanner: mx13.migadu.com X-Migadu-Spam-Score: -8.73 X-Spam-Score: -8.73 X-TUID: JR4TM2TS6EAD Zheng Junjie writes: > This partially reverts commit 877b925df16740f9419d165d39cb7f191a86d5d1. > > This part accidentally triggered a world rebuild for non-x86 architecture= s. > > Change-Id: Iabc5422bb0e2bb37816ad437994af94d04830cb0 > --- > gnu/packages/bootstrap.scm | 59 +++++++++++++++++++++++--------------- > 1 file changed, 36 insertions(+), 23 deletions(-) > > diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm > index dcf385b03e9..f2620f844c3 100644 > --- a/gnu/packages/bootstrap.scm > +++ b/gnu/packages/bootstrap.scm LGTM! > @@ -775,14 +775,14 @@ (define %bootstrap-glibc > (chmod "lib" #o755) >=20=20 > ;; Patch linker scripts so they refer to the right file-na= mes. > - ,(if (target-hurd64?) > - '(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)))))) > + ,@(if (target-hurd64?) > + '((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))) > @@ -874,20 +874,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" > @@ -895,10 +897,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))) --=20 Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar=C2=AE https://AvatarAcade= my.com