From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.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 MIp8CkyMUGctcwAAe85BDQ:P1 (envelope-from ) for ; Wed, 04 Dec 2024 17:07:24 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id MIp8CkyMUGctcwAAe85BDQ (envelope-from ) for ; Wed, 04 Dec 2024 18:07:24 +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="ORW/G2Cj"; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=OEbSKUlg; 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=1733332043; a=rsa-sha256; cv=none; b=JO6GC0GUbNsSVDnwADVodFHHSB0aCMfrbTRo4T1D5LtPPhszSEfmN04+2GLZWkErQNivsP YAT1E45bUI/2diPz1WH/tFjbaOAR9IZkvtYu3cM5iARxo8s44Y1qBtCNNiEh08dSM2LXzW iO09x0pGbIGnHWpG0pFWckAQt2rVjW4jYTzS0lD4DIj7+JMYIbSIWi2Tvi2OZ2b25Z5SKi SaV35mti9OYZYldCsm+oebsq7qS69j2dB0KhGQ1Yni8qEcpH6ecLi7PERtlOhn/4XLiugq u3DAhQJCn7yN0vlO+JYLX0snRAU+fvXN7TiwWTpG3yt10DEultyDL77XnRrQdQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b="ORW/G2Cj"; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=OEbSKUlg; 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=1733332043; 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=l9rIjeFQFket+NStpJ5Z+KI3VxYNy6N+Thsuh3p9rC0=; b=ApHZg3bx+RPJcO4WWkrlTUtBpvQg2HxV7nEMc7Z7eu9hOkSL4Xj+1tib7pb3w2ApB1gS7v nqwTI3KbusG32uOF5GYPcO9QkiMA5dp8jQxfHRlVMTovUbvCERmXXrDXn+012bOodCJUkV q4eIC1cuSQ34jcCn1oiRLCXZMdBuQsPQH8MXhFQF1eTV4Tx9G2BtU1jvlwsgyIF8ry8xc4 Yi7mBAWOMFXdmJi6GeqOChPQ3yaxVFDn+JfGMY42bhFiviNj5SKwQHbM1SOIMrTnjhWoeP E3Jx8uOvWrqMYxHCevypMNsSkzs4efQ99P2Kfpqmh4ml9bH2EfdKz1Td+5ffjg== 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 8A50355B7A for ; Wed, 04 Dec 2024 18:07:23 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tIsqC-0002sD-0C; Wed, 04 Dec 2024 12:07: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 1tIsq7-0002pg-3D for guix-patches@gnu.org; Wed, 04 Dec 2024 12:07: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 1tIsq6-0002Gm-QO for guix-patches@gnu.org; Wed, 04 Dec 2024 12:07: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=l9rIjeFQFket+NStpJ5Z+KI3VxYNy6N+Thsuh3p9rC0=; b=ORW/G2CjhCKKhkjdPH0eer7oflNPYZZFQDRigIJYjBFAnNk/uudFYCyNOi6PRlHo6Ufw8w0fT/ePAm091YYBt/TdB/cqNMsHcarYx+6YAqqDaY60zS/4gmQt5tgijBTGBE3vLRjyqH96U7D+fTVP7Kc4wWPxVqDPryIvysQVONt4t2UfwbCN5xbUCFg7mHKqq7REPQwIyoLJbqoY51VOFwFJoHF1lnaEJZ8Sk1MKSBhbv09qadCfW00SPFEtVpJffy6sWI73pDfZJQq//ULmHMkkxcd8sj0OT1UtU+GxSqwALtsuAOkwBOmeRUFtQnUUqyYAFE41mAqndTjoNHWBMA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tIsq6-00046U-Kl for guix-patches@gnu.org; Wed, 04 Dec 2024 12:07:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74689] [PATCH v2 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 17:07: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.173333200715731 (code B ref 74689); Wed, 04 Dec 2024 17:07:02 +0000 Received: (at 74689) by debbugs.gnu.org; 4 Dec 2024 17:06:47 +0000 Received: from localhost ([127.0.0.1]:36590 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tIspq-00045f-EZ for submit@debbugs.gnu.org; Wed, 04 Dec 2024 12:06:46 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44808) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tIspo-00045M-7x for 74689@debbugs.gnu.org; Wed, 04 Dec 2024 12:06:45 -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 1tIspi-0002A0-4Y; Wed, 04 Dec 2024 12:06:38 -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=l9rIjeFQFket+NStpJ5Z+KI3VxYNy6N+Thsuh3p9rC0=; b=OEbSKUlg3HSFUvCv8rwd 8rHMPsesnMuBPyXxTe7R6skRFPH+HbQq7il3fMB1g4QoCDgChFXKTd4bIRFGVl2mI819bg5fanLT2 rh/HivvqutNuoXy65COLV17P1JZvV7UwzPOiEaJGTKeSG/rNBRsTDdpUEDa6S3mIijpFgIKJ0NNs0 ObpO/T4/2Z63GhOxotnlalxejtfF/X+IKpwf+ZYddjuitJMIQppmg2m37gLbeN6o2lSaEAIcY7Kq4 7+eYHkTWFDTNLNt2tcvz8WNwW6RQl/v/RvCR6PWWkqh/g4zu0iGYUvMXmAul70r2aEdzIE7SqWbTf YmQKxcF6vZWGXw==; From: Janneke Nieuwenhuizen In-Reply-To: <285c99b508322a12003211f85b549dbe94b6d464.1733331428.git.zhengjunjie@iscas.ac.cn> (Zheng Junjie's message of "Thu, 5 Dec 2024 00:57:43 +0800") Organization: AvatarAcademy.nl References: <564993090580244a965311b5bb510655a9f85d97.1733331428.git.zhengjunjie@iscas.ac.cn> <285c99b508322a12003211f85b549dbe94b6d464.1733331428.git.zhengjunjie@iscas.ac.cn> X-Url: http://AvatarAcademy.nl Date: Wed, 04 Dec 2024 18:06:34 +0100 Message-ID: <87plm7bco5.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: 8A50355B7A X-Migadu-Scanner: mx13.migadu.com X-Migadu-Spam-Score: -8.73 X-Spam-Score: -8.73 X-TUID: 0Qtme9+PRh3I Zheng Junjie writes: > This partially reverts commit 204fe1b1f05f4438d1cf72c568b45696e55e54c9. > > This part accidentally triggered a world rebuild for non-x86 architecture= s. > > Change-Id: I921984ef5eff58792ffc17b64675db6a8e79695c > --- > gnu/packages/bootstrap.scm | 13 ++++++++----- > 1 file changed, 8 insertions(+), 5 deletions(-) > > diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm > index 226cf0804bd..dcf385b03e9 100644 > --- a/gnu/packages/bootstrap.scm > +++ b/gnu/packages/bootstrap.scm > @@ -775,11 +775,14 @@ (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?) > + '(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))) LGTM! --=20 Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar=C2=AE https://AvatarAcade= my.com