mirror of
https://codeberg.org/canoeboot/cbmk.git
synced 2025-01-22 07:00:08 +00:00
71bccad345
Tested on Debian Sid, as of 30 December 2024, which uses
Swig 4.3.0. Context here:
commit a63456b9191fae2fe49f4b121e025792022e3950
Author: Markus Volk <f_l_k@t-online.de>
Date: Wed Oct 30 06:07:16 2024 +0100
scripts/dtc/pylibfdt/libfdt.i_shipped: Use SWIG_AppendOutput
This patch from U-Boot upstream has been backported to the
release revision used by Libreboot. Swig has, since 4.3.0,
changed the language-specific AppendOutput functions, but
the helper macro SWIG_AppendOutput is identical; therefore,
upstream switched to this function.
The benefit of this fix is that since the newly used macro
is also the same on older Swig versions, and behaves the same,
this shouldn't fix building on older Swig versions. For reference,
the initial Libreboot 20241206 release, and revisions of it before
revision 8, was built on Debian 12 which uses Swig 4.1.0.
The rev8 release will still be compiled on Debian 12, but with
this change, it should also compile on Debian Sid, and bleeding
edge distros like Arch Linux.
Signed-off-by: Leah Rowe <leah@libreboot.org>
61 lines
2.3 KiB
Diff
61 lines
2.3 KiB
Diff
From 3c61a3257ad5799202cac64020d3b4af21b72de3 Mon Sep 17 00:00:00 2001
|
||
From: Markus Volk <f_l_k@t-online.de>
|
||
Date: Wed, 30 Oct 2024 06:07:16 +0100
|
||
Subject: [PATCH 1/1] scripts/dtc/pylibfdt/libfdt.i_shipped: Use
|
||
SWIG_AppendOutput
|
||
MIME-Version: 1.0
|
||
Content-Type: text/plain; charset=UTF-8
|
||
Content-Transfer-Encoding: 8bit
|
||
|
||
Swig has changed language specific AppendOutput functions. The helper
|
||
macro SWIG_AppendOutput remains unchanged. Use that instead
|
||
of SWIG_Python_AppendOutput, which would require an extra parameter
|
||
since swig 4.3.0.
|
||
|
||
/home/flk/poky/build-test/tmp/work/qemux86_64-poky-linux/u-boot/2024.10/git/arch/x86/cpu/u-boot-64.lds
|
||
| scripts/dtc/pylibfdt/libfdt_wrap.c: In function ‘_wrap_fdt_next_node’:
|
||
| scripts/dtc/pylibfdt/libfdt_wrap.c:5581:17: error: too few arguments to function ‘SWIG_Python_AppendOutput’
|
||
| 5581 | resultobj = SWIG_Python_AppendOutput(resultobj, val);
|
||
| | ^~~~~~~~~~~~~~~~~~~~~~~~
|
||
|
||
Signed-off-by: Markus Volk <f_l_k@t-online.de>
|
||
Reported-by: Rudi Heitbaum <rudi@heitbaum.com>
|
||
Link: https://github.com/dgibson/dtc/pull/154
|
||
---
|
||
scripts/dtc/pylibfdt/libfdt.i_shipped | 6 +++---
|
||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||
|
||
diff --git a/scripts/dtc/pylibfdt/libfdt.i_shipped b/scripts/dtc/pylibfdt/libfdt.i_shipped
|
||
index 56cc5d48f4..e4659489a9 100644
|
||
--- a/scripts/dtc/pylibfdt/libfdt.i_shipped
|
||
+++ b/scripts/dtc/pylibfdt/libfdt.i_shipped
|
||
@@ -1037,7 +1037,7 @@ typedef uint32_t fdt32_t;
|
||
fdt_string(fdt1, fdt32_to_cpu($1->nameoff)));
|
||
buff = PyByteArray_FromStringAndSize(
|
||
(const char *)($1 + 1), fdt32_to_cpu($1->len));
|
||
- resultobj = SWIG_Python_AppendOutput(resultobj, buff);
|
||
+ resultobj = SWIG_AppendOutput(resultobj, buff);
|
||
}
|
||
}
|
||
|
||
@@ -1076,7 +1076,7 @@ typedef uint32_t fdt32_t;
|
||
|
||
%typemap(argout) int *depth {
|
||
PyObject *val = Py_BuildValue("i", *arg$argnum);
|
||
- resultobj = SWIG_Python_AppendOutput(resultobj, val);
|
||
+ resultobj = SWIG_AppendOutput(resultobj, val);
|
||
}
|
||
|
||
%apply int *depth { int *depth };
|
||
@@ -1092,7 +1092,7 @@ typedef uint32_t fdt32_t;
|
||
if (PyTuple_GET_SIZE(resultobj) == 0)
|
||
resultobj = val;
|
||
else
|
||
- resultobj = SWIG_Python_AppendOutput(resultobj, val);
|
||
+ resultobj = SWIG_AppendOutput(resultobj, val);
|
||
}
|
||
}
|
||
|
||
--
|
||
2.39.5
|
||
|