summaryrefslogtreecommitdiffstats
path: root/meta/recipes-bsp/u-boot/files/0001-scripts-dtc-pylibfdt-libfdt.i_shipped-Use-SWIG_Appen.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-bsp/u-boot/files/0001-scripts-dtc-pylibfdt-libfdt.i_shipped-Use-SWIG_Appen.patch')
-rw-r--r--meta/recipes-bsp/u-boot/files/0001-scripts-dtc-pylibfdt-libfdt.i_shipped-Use-SWIG_Appen.patch60
1 files changed, 0 insertions, 60 deletions
diff --git a/meta/recipes-bsp/u-boot/files/0001-scripts-dtc-pylibfdt-libfdt.i_shipped-Use-SWIG_Appen.patch b/meta/recipes-bsp/u-boot/files/0001-scripts-dtc-pylibfdt-libfdt.i_shipped-Use-SWIG_Appen.patch
deleted file mode 100644
index 2eeef99b21..0000000000
--- a/meta/recipes-bsp/u-boot/files/0001-scripts-dtc-pylibfdt-libfdt.i_shipped-Use-SWIG_Appen.patch
+++ /dev/null
@@ -1,60 +0,0 @@
1From e093607e9a08e9c29b7bbaa6aeb137036db798a6 Mon Sep 17 00:00:00 2001
2From: Markus Volk <f_l_k@t-online.de>
3Date: Wed, 30 Oct 2024 05:46:00 +0100
4Subject: [PATCH] scripts/dtc/pylibfdt/libfdt.i_shipped: Use SWIG_AppendOutput
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9Swig has changed language specific AppendOutput functions. The helper
10macro SWIG_AppendOutput remains unchanged. Use that instead
11of SWIG_Python_AppendOutput, which would require an extra parameter
12since swig 4.3.0.
13
14/home/flk/poky/build-test/tmp/work/qemux86_64-poky-linux/u-boot/2024.10/git/arch/x86/cpu/u-boot-64.lds
15| scripts/dtc/pylibfdt/libfdt_wrap.c: In function ‘_wrap_fdt_next_node’:
16| scripts/dtc/pylibfdt/libfdt_wrap.c:5581:17: error: too few arguments to function ‘SWIG_Python_AppendOutput’
17| 5581 | resultobj = SWIG_Python_AppendOutput(resultobj, val);
18| | ^~~~~~~~~~~~~~~~~~~~~~~~
19
20Upstream-Status: Backport [https://github.com/u-boot/u-boot/commit/a63456b9191fae2fe49f4b121e025792022e3950]
21
22Signed-off-by: Markus Volk <f_l_k@t-online.de>
23---
24 scripts/dtc/pylibfdt/libfdt.i_shipped | 6 +++---
25 1 file changed, 3 insertions(+), 3 deletions(-)
26
27diff --git a/scripts/dtc/pylibfdt/libfdt.i_shipped b/scripts/dtc/pylibfdt/libfdt.i_shipped
28index 56cc5d48f4..e4659489a9 100644
29--- a/scripts/dtc/pylibfdt/libfdt.i_shipped
30+++ b/scripts/dtc/pylibfdt/libfdt.i_shipped
31@@ -1037,7 +1037,7 @@ typedef uint32_t fdt32_t;
32 fdt_string(fdt1, fdt32_to_cpu($1->nameoff)));
33 buff = PyByteArray_FromStringAndSize(
34 (const char *)($1 + 1), fdt32_to_cpu($1->len));
35- resultobj = SWIG_Python_AppendOutput(resultobj, buff);
36+ resultobj = SWIG_AppendOutput(resultobj, buff);
37 }
38 }
39
40@@ -1076,7 +1076,7 @@ typedef uint32_t fdt32_t;
41
42 %typemap(argout) int *depth {
43 PyObject *val = Py_BuildValue("i", *arg$argnum);
44- resultobj = SWIG_Python_AppendOutput(resultobj, val);
45+ resultobj = SWIG_AppendOutput(resultobj, val);
46 }
47
48 %apply int *depth { int *depth };
49@@ -1092,7 +1092,7 @@ typedef uint32_t fdt32_t;
50 if (PyTuple_GET_SIZE(resultobj) == 0)
51 resultobj = val;
52 else
53- resultobj = SWIG_Python_AppendOutput(resultobj, val);
54+ resultobj = SWIG_AppendOutput(resultobj, val);
55 }
56 }
57
58--
592.47.0
60