From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id 0D7VFt8sG2QIEQAASxT56A (envelope-from ) for ; Wed, 22 Mar 2023 17:29:19 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id IKWmFt8sG2SjAwEAauVa8A (envelope-from ) for ; Wed, 22 Mar 2023 17:29:19 +0100 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 1C9C71A7DA for ; Wed, 22 Mar 2023 17:29:18 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pf1Ki-0005OA-0m; Wed, 22 Mar 2023 12:29:04 -0400 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 1pf1Kg-0005Nz-Re for guix-patches@gnu.org; Wed, 22 Mar 2023 12:29:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pf1Kg-0002uV-Fa for guix-patches@gnu.org; Wed, 22 Mar 2023 12:29:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pf1Kg-0002C9-36 for guix-patches@gnu.org; Wed, 22 Mar 2023 12:29:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62307] [PATCH core-updates 00/15] Update Hurd and fix build failures Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 22 Mar 2023 16:29:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62307 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Josselin Poiret Cc: 62307@debbugs.gnu.org Received: via spool by 62307-submit@debbugs.gnu.org id=B62307.16795025318416 (code B ref 62307); Wed, 22 Mar 2023 16:29:02 +0000 Received: (at 62307) by debbugs.gnu.org; 22 Mar 2023 16:28:51 +0000 Received: from localhost ([127.0.0.1]:36439 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pf1KU-0002Bf-GV for submit@debbugs.gnu.org; Wed, 22 Mar 2023 12:28:50 -0400 Received: from eggs.gnu.org ([209.51.188.92]:41626) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pf1KS-0002BT-4e for 62307@debbugs.gnu.org; Wed, 22 Mar 2023 12:28:48 -0400 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 1pf1KM-0002qs-Fx; Wed, 22 Mar 2023 12:28:42 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=ylICjSRBELItnWqa2sFbmxBNAGNUQdF32H+j2mt+rQw=; b=WxsYpjOQjAGf6Gxn8Ow4 NM3UJvTgXXY4Xk4o5DfYxxs1ThDm1qOG0deL06giDFZJk5LmlmAgnPMlgeCmRXUHqQs1qbgwY69k6 SIusSuofr1leK43zFfGE0UYpugpBC+oyOzkLodnwfcEWVMMMhEabgpd3cLhNSfNT0CR9XJNl3TAVK wBqzauhyjilRtjAM/GqBgZpsh6oKbv8myRf8dAvSnJQfjUGSNhG5mHj0j14k1rWKOc08fHWmBu5Bz /dMacqch9rfC5mDPKCm7mxmuLa4R2hFtUb5I5DD5FKBGl/tRCh8kpE6rd3oncpFwNQj9Ed0nvuMk+ YoF6ZGZnFmABkQ==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201] helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pf1KM-0006QU-3W; Wed, 22 Mar 2023 12:28:42 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <479a095a315dc959fc63e26c24d7cb8843b947be.1679349992.git.dev@jpoiret.xyz> Date: Wed, 22 Mar 2023 17:28:39 +0100 In-Reply-To: <479a095a315dc959fc63e26c24d7cb8843b947be.1679349992.git.dev@jpoiret.xyz> (Josselin Poiret's message of "Mon, 20 Mar 2023 23:10:38 +0100") Message-ID: <87jzz8bvig.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) 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 ARC-Seal: i=1; s=key1; d=yhetil.org; t=1679502559; a=rsa-sha256; cv=none; b=G1r/MTcEuPzLIwbcEkOnsWpF928aDTvvruNJWRetYTZUGynEh/NElZaEJvnv8IdZVUmNHk cCeybTI60HmOZyHE0/AFS54R5ExoTXhKLyMiyBHxD938Z42rYfwfLLiSUqRZ6PcCVk7tfL QJp1avUVsS49eESwRTSAqdgSvDfVel72XIhqmKkRz5em6QGa/QMG+lEPUnnTjSSxPTcEbD DUs1LvUJ3xUiisjfFgijPOfAUr0YqS7Jy6NXc5x9RqyC2Jm4mqEfRHevqcXDSyL1M+5Wkg wIAGDmX1dzKlRsUyscb3OhbvAOHJLFpsEjN8GBGNAISfQJBYYbojFT8govtU/A== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=WxsYpjOQ; 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=1679502559; 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=ylICjSRBELItnWqa2sFbmxBNAGNUQdF32H+j2mt+rQw=; b=UcfUSQoEyvzftc1HmD3L/IXtpfNm5Gu76uJm1KpPz5aMUWO/EPDS4kgMztBVz2zPHo3OcY 6I2xzDKwRZzCNOH3Oc6bWL+qJ/DzvJp+q01kjNnbsKEYUxCL4KowXvGfIYWu//UAReG30E HdnUo1BFaIft+Va9SC0wgWLEEYooLSB9vxMB1zDnRUpnFEz2ViyI301Daug1QbB0gvhw9l 3gTtrpYA/AS+848+xOpn4M0ykRWkOkE4etGPdoxXdYc6obJ7m0AuzfWQ8p3RrlxskQAkQ5 VBJsu6+3w+gLadK3Yqp+f8KA88kbO7ASltSKHm2Kp39pXy0RnhUrdzcF9G3h9g== Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=WxsYpjOQ; 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" X-Migadu-Scanner: scn1.migadu.com X-Migadu-Spam-Score: -3.21 X-Spam-Score: -3.21 X-Migadu-Queue-Id: 1C9C71A7DA X-TUID: cTRCzIAA6fYE Josselin Poiret skribis: > * gnu/packages/gcc.scm (gcc-11): Add ugly conditional patching, to avoid a > world-rebuild. > * gnu/packages/cross-base.scm (cross-gcc): > * gnu/packages/commencement.scm (gcc-boot0): Pass the patch there as well. > * gnu/packages/patches/gcc-11-libstdc++-hurd-libpthread.patch: New file. > * gnu/local.mk (dist_patch_DATA): Register it. [...] > + ;; FIXME This patch is not in the origin because it is conditional= ly > + ;; applied, to avoid rebuilds at the end of the core-updates cycle. > + ;; Move to gcc-11's origin ASAP. > + ((target-hurd? (or (%current-target-system) > + (%current-system))) > + (list patch-boot0 (search-patch "gcc-11-libstdc++-hurd-libpthread= .patch"))) > + (#t '()))))) >=20=20 > (define perl-boot0 > (package > diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm > index 2959616af6..30bf1c6bd0 100644 > --- a/gnu/packages/cross-base.scm > +++ b/gnu/packages/cross-base.scm > @@ -319,14 +319,21 @@ (define* (cross-gcc target > ("libc" ,libc)) > `(,@inputs > ("mingw-source" ,(package-source mingw-w64))))) > - (libc > + (else > `(,@inputs > - ("libc" ,libc) > - ("libc:static" ,libc "static") > - ("xkernel-headers" ;the target headers > - ,@(assoc-ref (package-propagated-inputs libc) > - "kernel-headers")))) > - (else inputs))))) > + ;; FIXME Kludge to only apply the patch for hurd to avoid= rebuilds > + ;; remove ASAP, along with the accompanying changes. > + ,@(if (target-hurd? target) > + `(("patch" ,patch) > + ("_" ,(search-patch "gcc-11-libstdc++-hurd-libpth= read.patch"))) > + '()) > + ,@(if libc > + `(("libc" ,libc) > + ("libc:static" ,libc "static") > + ("xkernel-headers" ;the target headers > + ,@(assoc-ref (package-propagated-inputs libc) > + "kernel-headers"))) [...] > + ;; FIXME We conditionally apply a patch passed in native-inputs, to= avoid > + ;; rebuilds at the end of the core-updates cycle. Move this to a r= egular > + ;; patch ASAP. > + ((target-hurd? (or (%current-target-system) > + (%current-system))) > + (substitute-keyword-arguments (package-arguments gcc-8) > + ((#:phases phases) > + `(modify-phases ,phases > + (add-after 'unpack 'patch-libpthread-hurd > + (lambda* (#:key inputs native-inputs #:allow-other-keys) > + (define patch (search-input-file (or native-inputs input= s) "/bin/patch")) > + (define the-patch > + (cdr > + (car > + (filter (lambda (input) > + (string-suffix? "gcc-11-libstdc++-hurd-lib= pthread.patch" > + (cdr input))) > + (or native-inputs inputs))))) > + (invoke patch "--verbose" > + "--force" "--no-backup-if-mismatch" > + "-p1" "--input" the-patch))))))) > + (#t (package-arguments gcc-8)))) > + (native-inputs > + (cond > + ((target-hurd? (or (%current-target-system) > + (%current-system))) > + (modify-inputs (package-native-inputs gcc-8) > + (prepend (module-ref (resolve-interface '(gnu packages base)) 'p= atch) > + (search-patch "gcc-11-libstdc++-hurd-libpthread.patch")= ))) > + (#t (package-native-inputs gcc-8)))) So, we should discuss with others whether we can instead do another round of rebuilds. I know, I know, but this is really quite complicated and better avoided. Side note: please use =E2=80=98if=E2=80=99 rather than =E2=80=98cond=E2=80= =99 when there are only two possibilities. Ludo=E2=80=99.