unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Josselin Poiret via Guix-patches via <guix-patches@gnu.org>
To: Maxim Cournoyer <maxim.cournoyer@gmail.com>,
	Josselin Poiret <dev@jpoiret.xyz>
Cc: 62309@debbugs.gnu.org
Subject: [bug#62309] [PATCH core-updates v2 2/2] u-boot: Fix build under Python 3.10.
Date: Tue, 21 Mar 2023 09:59:37 +0100	[thread overview]
Message-ID: <1896443a4ab3038fdbd1077a625178eeae1f737b.1679389017.git.dev@jpoiret.xyz> (raw)
In-Reply-To: <cover.1679389017.git.dev@jpoiret.xyz>

* 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..73cf7b89a1 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	\
   %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 <msuchanek@suse.de>
+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 <msuchanek@suse.de>
+Reviewed-by: Simon Glass <sjg@chromium.org>
+---
+ 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 <stdint.i>
+ 
+ %{
+-- 
+GitLab
+
-- 
2.39.2





  parent reply	other threads:[~2023-03-21  9:00 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-03-20 22:23 [bug#62309] [PATCH core-updates 0/2] Fix qemu build Josselin Poiret via Guix-patches via
2023-03-20 22:26 ` [bug#62309] [PATCH core-updates 1/2] opensbi: Build with default gcc, with microarch rv64g Josselin Poiret via Guix-patches via
2023-03-21  1:29   ` [bug#62309] [PATCH core-updates 0/2] Fix qemu build Maxim Cournoyer
2023-03-21  8:59     ` [bug#62309] [PATCH core-updates v2 " Josselin Poiret via Guix-patches via
2023-03-21  8:59       ` [bug#62309] [PATCH core-updates v2 1/2] opensbi: Build with default gcc, with microarch rv64g Josselin Poiret via Guix-patches via
2023-03-21 16:07         ` Maxim Cournoyer
2023-03-21  8:59       ` Josselin Poiret via Guix-patches via [this message]
2023-03-21 16:14         ` [bug#62309] [PATCH core-updates v2 2/2] u-boot: Fix build under Python 3.10 Maxim Cournoyer
2023-03-21 18:32           ` Josselin Poiret via Guix-patches via
2023-03-22 18:23             ` Maxim Cournoyer
2023-03-26 20:30           ` bug#62309: [PATCH core-updates 0/2] Fix qemu build Ludovic Courtès
2023-03-20 22:26 ` [bug#62309] [PATCH core-updates 2/2] u-boot: Fix build under Python 3.10 Josselin Poiret via Guix-patches via
2023-03-21  1:32   ` [bug#62309] [PATCH core-updates 0/2] Fix qemu build Maxim Cournoyer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1896443a4ab3038fdbd1077a625178eeae1f737b.1679389017.git.dev@jpoiret.xyz \
    --to=guix-patches@gnu.org \
    --cc=62309@debbugs.gnu.org \
    --cc=dev@jpoiret.xyz \
    --cc=maxim.cournoyer@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).