* Re: [PATCH] libfdt: Fix build with swig 4.3.0 [not found] <Zxzh0ODFyZnav5JE@74d70d9af7e3> @ 2024-10-29 12:52 ` Xi Ruoyao 2024-10-30 1:08 ` David Gibson 0 siblings, 1 reply; 4+ messages in thread From: Xi Ruoyao @ 2024-10-29 12:52 UTC (permalink / raw) To: Rudi Heitbaum, u-boot; +Cc: devicetree-compiler 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@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@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@xry111.site> School of Aerospace Science and Technology, Xidian University ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] libfdt: Fix build with swig 4.3.0 2024-10-29 12:52 ` [PATCH] libfdt: Fix build with swig 4.3.0 Xi Ruoyao @ 2024-10-30 1:08 ` David Gibson 2024-10-31 12:36 ` Rob Herring 0 siblings, 1 reply; 4+ messages in thread From: David Gibson @ 2024-10-30 1:08 UTC (permalink / raw) To: Xi Ruoyao; +Cc: Rudi Heitbaum, u-boot, devicetree-compiler [-- Attachment #1: Type: text/plain, Size: 2326 bytes --] On Tue, Oct 29, 2024 at 08:52:52PM +0800, Xi Ruoyao wrote: > 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@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@vger.kernel.org. Looks like someone independently fixed it upstream: https://github.com/dgibson/dtc/pull/154 I'm doing final tests now and expect to merge shortly. > > > --- > > 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); > > } > > } > > > -- David Gibson (he or they) | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you, not the other way | around. http://www.ozlabs.org/~dgibson [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --] ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] libfdt: Fix build with swig 4.3.0 2024-10-30 1:08 ` David Gibson @ 2024-10-31 12:36 ` Rob Herring 2024-11-06 3:24 ` David Gibson 0 siblings, 1 reply; 4+ messages in thread From: Rob Herring @ 2024-10-31 12:36 UTC (permalink / raw) To: David Gibson; +Cc: Xi Ruoyao, Rudi Heitbaum, u-boot, devicetree-compiler On Tue, Oct 29, 2024 at 8:10 PM David Gibson <david@gibson.dropbear.id.au> wrote: > > On Tue, Oct 29, 2024 at 08:52:52PM +0800, Xi Ruoyao wrote: > > 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@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@vger.kernel.org. > > Looks like someone independently fixed it upstream: > https://github.com/dgibson/dtc/pull/154 > > I'm doing final tests now and expect to merge shortly. Would be good to tag a release too, so that distros have something to pick up when they update swig. Rob ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] libfdt: Fix build with swig 4.3.0 2024-10-31 12:36 ` Rob Herring @ 2024-11-06 3:24 ` David Gibson 0 siblings, 0 replies; 4+ messages in thread From: David Gibson @ 2024-11-06 3:24 UTC (permalink / raw) To: Rob Herring; +Cc: Xi Ruoyao, Rudi Heitbaum, u-boot, devicetree-compiler [-- Attachment #1: Type: text/plain, Size: 1261 bytes --] On Thu, Oct 31, 2024 at 07:36:15AM -0500, Rob Herring wrote: > On Tue, Oct 29, 2024 at 8:10 PM David Gibson > <david@gibson.dropbear.id.au> wrote: > > > > On Tue, Oct 29, 2024 at 08:52:52PM +0800, Xi Ruoyao wrote: > > > 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@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@vger.kernel.org. > > > > Looks like someone independently fixed it upstream: > > https://github.com/dgibson/dtc/pull/154 > > > > I'm doing final tests now and expect to merge shortly. > > Would be good to tag a release too, so that distros have something to > pick up when they update swig. Done. -- David Gibson (he or they) | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you, not the other way | around. http://www.ozlabs.org/~dgibson [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --] ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-11-06 3:28 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <Zxzh0ODFyZnav5JE@74d70d9af7e3>
2024-10-29 12:52 ` [PATCH] libfdt: Fix build with swig 4.3.0 Xi Ruoyao
2024-10-30 1:08 ` David Gibson
2024-10-31 12:36 ` Rob Herring
2024-11-06 3:24 ` David Gibson
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 NNTP newsgroup(s).