From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id gJnhE2UJGWTOHQAASxT56A (envelope-from ) for ; Tue, 21 Mar 2023 02:33:25 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id 2KjjE2UJGWQUbQEA9RJhRA (envelope-from ) for ; Tue, 21 Mar 2023 02:33:25 +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 E7A043ABC6 for ; Tue, 21 Mar 2023 02:33:24 +0100 (CET) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=fy8LLX4b; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); 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=1679362405; 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: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=QvcwbpdLzcXgTuSSR5RsjlwymN3pW5ynY/rsF+apNkM=; b=atIoT71Kn5DaJN+xRcHgZUzkUOq8UFXJH78QbnRJLySxkh9sYivY1QHIry1daN/cNme7BZ o+JaXv0oUgWvjcOjDswG/fxepTuYUXuBzR1KpTuEgm8Q+EBoGEW7hELsEncM3a6gZd4aUk mj/RaObLtN3FjhRNZzAeEDCvHH/amS0RZa2jG8WDp3Sr4mWHCKSgGDKP1tk+DTykxTYdDR I/QXYtJWj1aZDleS9USMFWbloBoJnfhqzX+2jAkZFYJkhwtks6lcX+0jdiobH/YbcMNEKu LodnLpZmuKbOn7cxH1DxCXUtDqI9ff3AbgHbZUrn/PkR03w9e7KPmhRruiZWxw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=fy8LLX4b; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); 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=1679362405; a=rsa-sha256; cv=none; b=i02C97eT+Eyu1NIhhDbL/L0ajLPhlSI+NMKEfhMAke0JOM7gxe6Op5BwdhsevI9d2UgsBF 1FzPyHrjS35F2zw0h0d7NPWeytnjfcwa0U0a+q7zfOiuQNxvfN77bPM86qfXAZ6MYcaKA9 9iNRINZU+Tgb9tlqIOPIGvY/CbqmIwmiW8nc2yxpf3B7qfm9ZiW3TOV7cc6Hle0sHmJmI2 QMGOcigtgWk8YV/yGuIEuKKSBqFacCN2wlyY2Zba632Iuz0B4z7CqsRgUakGFUrcgYc2im Oyt5Pyq7442GK6zn3gUH84K5A44p3k8Y2By2SA546cA1mcJrJ6K1yZ4+WZxpTw== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1peQs6-0005xO-3e; Mon, 20 Mar 2023 21:33:06 -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 1peQs2-0005wH-DB for guix-patches@gnu.org; Mon, 20 Mar 2023 21:33: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 1peQs2-0001gn-4x for guix-patches@gnu.org; Mon, 20 Mar 2023 21:33:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1peQs1-0006cY-W9 for guix-patches@gnu.org; Mon, 20 Mar 2023 21:33:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62309] [PATCH core-updates 0/2] Fix qemu build Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 21 Mar 2023 01:33:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62309 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Josselin Poiret Cc: 62309@debbugs.gnu.org Received: via spool by 62309-submit@debbugs.gnu.org id=B62309.167936233425380 (code B ref 62309); Tue, 21 Mar 2023 01:33:01 +0000 Received: (at 62309) by debbugs.gnu.org; 21 Mar 2023 01:32:14 +0000 Received: from localhost ([127.0.0.1]:57198 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peQrF-0006bI-RQ for submit@debbugs.gnu.org; Mon, 20 Mar 2023 21:32:14 -0400 Received: from mail-qv1-f53.google.com ([209.85.219.53]:46625) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peQrD-0006b2-O1 for 62309@debbugs.gnu.org; Mon, 20 Mar 2023 21:32:12 -0400 Received: by mail-qv1-f53.google.com with SMTP id q88so2827907qvq.13 for <62309@debbugs.gnu.org>; Mon, 20 Mar 2023 18:32:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679362326; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=QvcwbpdLzcXgTuSSR5RsjlwymN3pW5ynY/rsF+apNkM=; b=fy8LLX4beH54Z5A7fvnyXBNOF/nSr5kuDsi6rh8Ws+SoYEONtK43iilZ/ngNKUWK11 WqeId8hPT33WFA6LxQ6FZ/rt3T1gr2nKY9Y22jhxcaHd+azGJLgsQKHPh5y9AUbt7vXx pBmmyydtOhggcskUzVGUNvy/pgYL14+rPIFvIzh8gawVrBeGJlYsDid/ZZgpd+59FrwK gNw5tAj5YwCdsejbZ/JjWZe+NKvzwQj+QTJb6iPUt11+CuCQEJP95PSuStreQsPiqlDW HXRY/WoWlkTXPTEkxTErZWRyrWxLZFVA2gJbCXb8OxcN4f6oMbWt9+IJc5oOzuN5E4iX aQZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679362326; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=QvcwbpdLzcXgTuSSR5RsjlwymN3pW5ynY/rsF+apNkM=; b=bd22HYgrg1YUWDThWk94AXbWWXRsyuU4MQnN2Z34JsKbV8e+9XTTmcj9dVOhtjjLcH eHiN+PnpqoTYPMwVQqqKZkZNOzC8BLjKG2IsJwOdbYhPU0w8sLVj1bW6l/WzOOiPOfcc XhPIfg6qAAa++t5nVIs73zOIZnTP9QfecHLf5A4zRa+20GJc+7pmYozNJ5ulb+nJVptm IjkiLSwRwSvp9u/AoG4VwRgRTo6xP3rrX3urMg0C5dqajib/hrhOAHcm8P4xNblAd5KC 88en+2panj95Rq/2y2Lt2vLb3y8QFy0attlVHUCngoEEP5Ieg847Q3QlZXONyDlASL09 MQFQ== X-Gm-Message-State: AO0yUKUxA0l4q0/GHxYbYu57iprWSgYd5QAHE16iERmYaCcKVcxQjmlA mAmqRT0gtJUy0xSeHLUeFj+k2ZaTHqU= X-Google-Smtp-Source: AK7set+GdPEYuoeRZhSF4WmXYx2tVdan/cB+13FVZF2dQmaIIKoBwGhrbH+VQPlPuvX0j4eccJWJ7g== X-Received: by 2002:a05:6214:2587:b0:5ac:c5a1:7ced with SMTP id fq7-20020a056214258700b005acc5a17cedmr2129537qvb.0.1679362326013; Mon, 20 Mar 2023 18:32:06 -0700 (PDT) Received: from hurd (dsl-10-128-46.b2b2c.ca. [72.10.128.46]) by smtp.gmail.com with ESMTPSA id w8-20020a05620a148800b0073b27323c6dsm45244qkj.136.2023.03.20.18.32.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Mar 2023 18:32:05 -0700 (PDT) From: Maxim Cournoyer References: <63a067a83bcb04fae466b42c818abef4859dfffc.1679350685.git.dev@jpoiret.xyz> Date: Mon, 20 Mar 2023 21:32:03 -0400 In-Reply-To: <63a067a83bcb04fae466b42c818abef4859dfffc.1679350685.git.dev@jpoiret.xyz> (Josselin Poiret's message of "Mon, 20 Mar 2023 23:26:37 +0100") Message-ID: <87lejq3n58.fsf_-_@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain 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: X-Migadu-Queue-Id: E7A043ABC6 X-Spam-Score: -1.45 X-Migadu-Spam-Score: -1.45 X-Migadu-Scanner: scn0.migadu.com 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 X-TUID: k9YsUGuvQFge Hello, Josselin Poiret writes: > * gnu/packages/patches/u-boot-fix-build-python-3.10.patch: New file. > * gnu/local.mk (dist_patch_DATA): Register it. > * gnu/packages/bootloaders.scm (u-boot): Apply patch. > --- > gnu/local.mk | 1 + > gnu/packages/bootloaders.scm | 3 ++ > .../u-boot-fix-build-python-3.10.patch | 35 +++++++++++++++++++ > 3 files changed, 39 insertions(+) > create mode 100644 gnu/packages/patches/u-boot-fix-build-python-3.10.patch > > diff --git a/gnu/local.mk b/gnu/local.mk > index 058b23c683..20bf2bea77 100644 > --- a/gnu/local.mk > +++ b/gnu/local.mk > @@ -1936,6 +1936,7 @@ dist_patch_DATA = \ > %D%/packages/patches/tuxpaint-stamps-path.patch \ > %D%/packages/patches/twinkle-bcg729.patch \ > %D%/packages/patches/u-boot-allow-disabling-openssl.patch \ > + %D%/packages/patches/u-boot-fix-build-python-3.10.patch \ It probably doesn't matter too much, but the other lines use tabs to align the backslash, while your change uses spaces. > %D%/packages/patches/u-boot-infodocs-target.patch \ > %D%/packages/patches/u-boot-patman-guix-integration.patch \ > %D%/packages/patches/u-boot-nintendo-nes-serial.patch \ > diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm > index ac269807be..457f3b3994 100644 > --- a/gnu/packages/bootloaders.scm > +++ b/gnu/packages/bootloaders.scm > @@ -655,6 +655,9 @@ (define u-boot > %u-boot-allow-disabling-openssl-patch > %u-boot-sifive-prevent-relocating-initrd-fdt > %u-boot-rk3399-enable-emmc-phy-patch > + ;; FIXME The following patch is backported from 2023.01, > + ;; remove when updating. > + (search-patch "u-boot-fix-build-python-3.10.patch") > (search-patch "u-boot-infodocs-target.patch") > (search-patch "u-boot-patman-guix-integration.patch"))) > (method url-fetch) > diff --git a/gnu/packages/patches/u-boot-fix-build-python-3.10.patch b/gnu/packages/patches/u-boot-fix-build-python-3.10.patch > new file mode 100644 > index 0000000000..27c03f92f4 > --- /dev/null > +++ b/gnu/packages/patches/u-boot-fix-build-python-3.10.patch > @@ -0,0 +1,35 @@ > +From 7d01bb1c5a1daef0187c9ea276bde19a8d0e7fde Mon Sep 17 00:00:00 2001 > +From: Michal Suchanek > +Date: Thu, 13 Oct 2022 22:43:41 +0200 > +Subject: [PATCH] libfdt: Fix build with python 3.10 > + > +Python 3.10 requires defining PY_SSIZE_T_CLEAN. This will be fixed in > +swig 4.10 but it is not clear when it will be released. There was a > +warning since python 3.8. > + > +Link: https://github.com/swig/swig/pull/2277 > + > +Signed-off-by: Michal Suchanek > +Reviewed-by: Simon Glass > +--- > + scripts/dtc/pylibfdt/libfdt.i_shipped | 4 ++++ > + 1 file changed, 4 insertions(+) > + > +diff --git a/scripts/dtc/pylibfdt/libfdt.i_shipped b/scripts/dtc/pylibfdt/libfdt.i_shipped > +index 27c29ea260..56cc5d48f4 100644 > +--- a/scripts/dtc/pylibfdt/libfdt.i_shipped > ++++ b/scripts/dtc/pylibfdt/libfdt.i_shipped > +@@ -7,6 +7,10 @@ > + > + %module libfdt > + > ++%begin %{ > ++#define PY_SSIZE_T_CLEAN > ++%} > ++ > + %include > + > + %{ > +-- > +GitLab > + The rest LGTM. -- Thanks, Maxim