tequilaOS/platform_external_dtc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

pylibfdt: fix with Python 3.10

Browse source 
Since Python 2.5 the argument parsing functions when parsing expressions
such as s# (string plus length) expect the length to be an int or a
ssize_t, depending on whether PY_SSIZE_T_CLEAN is defined or not.

Python 3.8 deprecated the use of int, and with Python 3.10 this symbol
must be defined and ssize_t used[1].

Define the magic symbol when building the extension, and cast the ints
from the libfdt API to ssize_t as appropriate.

[1] https://docs.python.org/3.10/whatsnew/3.10.html#id2

Signed-off-by: Ross Burton <ross.burton@arm.com>
Message-Id: <20211111160536.2516573-1-ross.burton@arm.com>
[dwg: Adjust for new location of setup.py]
Tested-by: Rob Herring <robh@kernel.org>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Ross Burton 2021-11-11 16:05:36 +00:00 committed by David Gibson
parent 23b56cb7e1
commit 383e148b70
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pylibfdt/libfdt.i
View file

@ -1044,9 +1044,9 @@ typedef uint32_t fdt32_t;
$result = Py_None; $result = Py_None;
else else
%#if PY_VERSION_HEX >= 0x03000000 %#if PY_VERSION_HEX >= 0x03000000
$result = Py_BuildValue("y#", $1, *arg4); $result = Py_BuildValue("y#", $1, (Py_ssize_t)*arg4);
%#else %#else
$result = Py_BuildValue("s#", $1, *arg4); $result = Py_BuildValue("s#", $1, (Py_ssize_t)*arg4);
%#endif %#endif
} }

1
setup.py
View file

@ -30,6 +30,7 @@ top_builddir = get_top_builddir()
libfdt_module = Extension( libfdt_module = Extension(
'_libfdt', '_libfdt',
sources=[os.path.join(srcdir, 'pylibfdt/libfdt.i')], sources=[os.path.join(srcdir, 'pylibfdt/libfdt.i')],
define_macros=[('PY_SSIZE_T_CLEAN', None)],
include_dirs=[os.path.join(srcdir, 'libfdt')], include_dirs=[os.path.join(srcdir, 'libfdt')],
libraries=['fdt'], libraries=['fdt'],
library_dirs=[os.path.join(top_builddir, 'libfdt')], library_dirs=[os.path.join(top_builddir, 'libfdt')],