diff options
Diffstat (limited to 'libre/uboot4extlinux-sunxi/0001-Fix-build-with-python-3.10.patch')
| -rw-r--r-- | libre/uboot4extlinux-sunxi/0001-Fix-build-with-python-3.10.patch | 69 |
1 files changed, 69 insertions, 0 deletions
diff --git a/libre/uboot4extlinux-sunxi/0001-Fix-build-with-python-3.10.patch b/libre/uboot4extlinux-sunxi/0001-Fix-build-with-python-3.10.patch new file mode 100644 index 000000000..3ecfe7584 --- /dev/null +++ b/libre/uboot4extlinux-sunxi/0001-Fix-build-with-python-3.10.patch @@ -0,0 +1,69 @@ +From c977b184350479b8c43a0e002eaf2b13b510ba4f Mon Sep 17 00:00:00 2001 +From: Michal Suchanek <msuchanek@suse.de> +Date: Thu, 13 Oct 2022 22:39:51 +0200 +Subject: [PATCH 1/2] libfdt: Fix invalid version warning + +python does not like the u-boot- prefix in the version, drop it. + +/usr/lib/python3.10/site-packages/setuptools/dist.py:544: UserWarning: +The version specified ('u-boot-2022.10') is an invalid version, this may +not work as expected with newer versions of setuptools, pip, and PyPI. +Please see PEP 440 for more details. + +Signed-off-by: Michal Suchanek <msuchanek@suse.de> +Reviewed-by: Simon Glass <sjg@chromium.org> +--- + scripts/dtc/pylibfdt/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripts/dtc/pylibfdt/Makefile b/scripts/dtc/pylibfdt/Makefile +index 493995e303..a7579f0c5f 100644 +--- a/scripts/dtc/pylibfdt/Makefile ++++ b/scripts/dtc/pylibfdt/Makefile +@@ -17,7 +17,7 @@ quiet_cmd_pymod = PYMOD $@ + cmd_pymod = unset CROSS_COMPILE; unset CFLAGS; \ + CC="$(HOSTCC)" LDSHARED="$(HOSTCC) -shared " \ + LDFLAGS="$(HOSTLDFLAGS)" \ +- VERSION="u-boot-$(UBOOTVERSION)" \ ++ VERSION="$(UBOOTVERSION)" \ + CPPFLAGS="$(HOSTCFLAGS) -I$(LIBFDT_srcdir)" OBJDIR=$(obj) \ + SOURCES="$(PYLIBFDT_srcs)" \ + SWIG_OPTS="-I$(LIBFDT_srcdir) -I$(LIBFDT_srcdir)/.." \ +-- +2.43.1 + +From 7d01bb1c5a1daef0187c9ea276bde19a8d0e7fde Mon Sep 17 00:00:00 2001 +From: Michal Suchanek <msuchanek@suse.de> +Date: Thu, 13 Oct 2022 22:43:41 +0200 +Subject: [PATCH 2/2] libfdt: Fix build with python 3.10 + +Python 3.10 requires defining PY_SSIZE_T_CLEAN. This will be fixed in +swig 4.10 but it is not clear when it will be released. There was a +warning since python 3.8. + +Link: https://github.com/swig/swig/pull/2277 + +Signed-off-by: Michal Suchanek <msuchanek@suse.de> +Reviewed-by: Simon Glass <sjg@chromium.org> +--- + scripts/dtc/pylibfdt/libfdt.i_shipped | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/scripts/dtc/pylibfdt/libfdt.i_shipped b/scripts/dtc/pylibfdt/libfdt.i_shipped +index 27c29ea260..56cc5d48f4 100644 +--- a/scripts/dtc/pylibfdt/libfdt.i_shipped ++++ b/scripts/dtc/pylibfdt/libfdt.i_shipped +@@ -7,6 +7,10 @@ + + %module libfdt + ++%begin %{ ++#define PY_SSIZE_T_CLEAN ++%} ++ + %include <stdint.i> + + %{ +-- +2.43.1 + |