From patchwork Wed Mar 22 14:54:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 48584 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id D875116FA7; Wed, 22 Mar 2023 14:55:28 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1D59816F83 for ; Wed, 22 Mar 2023 14:55:25 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pezrn-0004zn-IO; Wed, 22 Mar 2023 10:55:07 -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 1pezri-0004zV-Pg for guix-patches@gnu.org; Wed, 22 Mar 2023 10:55: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 1pezri-0000yQ-Fv for guix-patches@gnu.org; Wed, 22 Mar 2023 10:55:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pezri-0005j1-9W for guix-patches@gnu.org; Wed, 22 Mar 2023 10:55: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 14:55: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.167949688321973 (code B ref 62307); Wed, 22 Mar 2023 14:55:02 +0000 Received: (at 62307) by debbugs.gnu.org; 22 Mar 2023 14:54:43 +0000 Received: from localhost ([127.0.0.1]:36344 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pezrP-0005iK-Bn for submit@debbugs.gnu.org; Wed, 22 Mar 2023 10:54:43 -0400 Received: from eggs.gnu.org ([209.51.188.92]:42842) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pezrN-0005i5-CS for 62307@debbugs.gnu.org; Wed, 22 Mar 2023 10:54:41 -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 1pezrI-0000rI-1Z; Wed, 22 Mar 2023 10:54:36 -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=aZZVpY01MbSkygzJWARd0gZfs3VCP/6S/KDQYwxLUc0=; b=YoFW/4ySNlmTk/2XGb4d I+DF9DhjrojxArnbu/GqxfluIlRS9EDb56OOWI985ehfAgPHJnqDAzq7P/2/co/wfAkCaDAHMwGzn SMpnet6XRsUzDnnHWgfKTLswvdNhG/FdjB7wCZcZNx+NkN7e+mMHBujLQibbGiC5WJDMBo5o9N41x dOi2S98PE+eVJBlvXkfmH0z1p1oao61tmHXD4rjEvqqz5qlshIHFQOMWGWw2i/OLGzP7V8OP8PPXd 7aVoq1JFUVJUiZTPrFhhuzyBvdZGgHQIKlgVsFtnDNQFKlHtwWYgHvRk29rhhAGIt2QyFrIZWAL12 FGFOXKayGYoucg==; 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 1pezrH-0000pP-Gh; Wed, 22 Mar 2023 10:54:35 -0400 From: Ludovic =?utf-8?q?Court=C3=A8s?= References: <6a027350c8639d0c52cdda781abb9f7d304f64ed.1679349992.git.dev@jpoiret.xyz> Date: Wed, 22 Mar 2023 15:54:33 +0100 In-Reply-To: <6a027350c8639d0c52cdda781abb9f7d304f64ed.1679349992.git.dev@jpoiret.xyz> (Josselin Poiret's message of "Mon, 20 Mar 2023 23:10:36 +0100") Message-ID: <87pm90bzva.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Hi, Josselin Poiret skribis: > * gnu/packages/base.scm (glibc/fix-for-hurd-cross): New variable. > (glibc/hurd-headers): Inherit it. > * gnu/packages/patches/glibc-hurd-add-freestanding-for-configure.patch: > * gnu/packages/patches/glibc-hurd-add-freestanding-to-cppflags.patch: New files > * gnu/local.mk (dist_patch_DATA): Register patches. I’d like to keep this approach (defining a package variant and carrying Hurd-specific patches) as a last resort. If I’m not mistaken, we should be able to achieve the same result with a patch like this one (untested): How does that sound? Thanks, Ludo’. diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index 2959616af6..9db12bcf9f 100644 --- a/gnu/packages/cross-base.scm +++ b/gnu/packages/cross-base.scm @@ -577,7 +577,20 @@ (define* (cross-libc* target ((#:configure-flags flags) `(cons ,(string-append "--host=" target) ,(if (target-hurd? target) - `(cons "--disable-werror" ,flags) + `(cons* "--disable-werror" + + ;; 'configure' in glibc 2.35 omits to pass + ;; '-ffreestanding' when detecting Mach + ;; headers. This is fixed in glibc commits + ;; 8b8c768e3c701ed1993789bb46acb8a12c7a93df + ;; and + ;; 7685630b98ca2a3f5de86eadf130993e6cf998a0; + ;; as a workaround, bypass those tests. + "ac_cv_header_mach_mach_types_defs=yes" + "ac_cv_header_mach_mach_types_h=yes" + "ac_cv_header_mach_machine_ndr_def_h=yes" + "libc_cv_mach_task_creation_time=yes" + ,flags) flags))) ((#:phases phases) `(modify-phases ,phases