0008-scripts-dtc-pylibfdt-libfdt.i_shipped-Use-SWIG_Appen.patch 2.3 KB

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