[PATCH] libfdt: Fix build with swig 4.3.0

Xi Ruoyao xry111 at xry111.site
Tue Oct 29 13:52:52 CET 2024


On Sat, 2024-10-26 at 12:34 +0000, Rudi Heitbaum wrote:
> Call SWIG_AppendOutput instead of SWIG_Python_AppendOutput so that
> is_void is handled within swig.
> 
> Link: https://github.com/swig/swig/commit/cd39cf132c96a0887be07c826b80804d7677a701
> 
> Signed-off-by: Rudi Heitbaum <rudi at heitbaum.com>

Dtc is a separate project at
https://git.kernel.org/pub/scm/utils/dtc/dtc.git, so the patch should be
rebased against it and sent to devicetree-compiler at vger.kernel.org.

> ---
>  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);
>          }
>  }
>  

-- 
Xi Ruoyao <xry111 at xry111.site>
School of Aerospace Science and Technology, Xidian University


More information about the U-Boot mailing list