diff options
| author | Alexander Kanavin <alex.kanavin@gmail.com> | 2024-01-16 12:08:14 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-01-19 12:21:22 +0000 |
| commit | 78e30d940d1a931c65a14d864494d92f0889035e (patch) | |
| tree | 32e87ef22610ef937dd5e1b9a604d0deacf39107 /meta/recipes-devtools/python/python3/0001-setup.py-Do-not-detect-multiarch-paths-when-cross-co.patch | |
| parent | 375ac472d848eb6bdd17656cfe005c905025ffab (diff) | |
| download | poky-78e30d940d1a931c65a14d864494d92f0889035e.tar.gz | |
python: update 3.11.5 -> 3.12.1
Drop distutils and smtpd modules from packaging, as both are gone in 3.12.
Rebase:
0020-configure.ac-setup.py-do-not-add-a-curses-include-pa.patch
(drop setup.py chunk as the file is gone)
Drop patches:
0001-Do-not-add-usr-lib-termcap-to-linker-flags-to-avoid-.patch
(setup.py gone, lib/termcap not mentioned anywhere else)
0001-Don-t-search-system-for-headers-libraries.patch
(setup.py gone, usr/lib64 not mentioned anywhere else)
0001-Makefile-do-not-compile-.pyc-in-parallel.patch
(replaced with COMPILEALL_OPTS= in EXTRA_OEMAKE)
0001-setup.py-Do-not-detect-multiarch-paths-when-cross-co.patch
(setup.py gone, add_multiarch_paths not mentioned anywhere else)
0017-setup.py-do-not-report-missing-dependencies-for-disa.patch
(has been superseded by Setup.local tweak in do_configure:prepend)
12-distutils-prefix-is-inside-staging-area.patch
(distutils has been removed upstream, so this old, unplesant hack can be finally dropped)
avoid_warning_about_tkinter.patch
(setup.py gone, tkinter detection logic performed in configure.ac)
(From OE-Core rev: 716d82352545d3667a658b69d65d6127678dd150)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/python/python3/0001-setup.py-Do-not-detect-multiarch-paths-when-cross-co.patch')
| -rw-r--r-- | meta/recipes-devtools/python/python3/0001-setup.py-Do-not-detect-multiarch-paths-when-cross-co.patch | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/meta/recipes-devtools/python/python3/0001-setup.py-Do-not-detect-multiarch-paths-when-cross-co.patch b/meta/recipes-devtools/python/python3/0001-setup.py-Do-not-detect-multiarch-paths-when-cross-co.patch deleted file mode 100644 index 1844e0efa3..0000000000 --- a/meta/recipes-devtools/python/python3/0001-setup.py-Do-not-detect-multiarch-paths-when-cross-co.patch +++ /dev/null | |||
| @@ -1,42 +0,0 @@ | |||
| 1 | From dc966f1278c1077938626d682666767d2c8d0c72 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Sat, 9 Apr 2022 18:29:47 +0000 | ||
| 4 | Subject: [PATCH] setup.py: Do not detect multiarch paths when cross-compiling | ||
| 5 | |||
| 6 | add_multiarch_paths() function relies on host tools like dpkg-configure | ||
| 7 | to operate, which is not good when cross compiling, since it ends up | ||
| 8 | adding native paths in includes in certain cases, e.g. when building | ||
| 9 | for aarch64 targets using aarch64 build hosts running debian-like | ||
| 10 | distributions e.g. ubuntu, it ends up adding native multiarch paths | ||
| 11 | -I/usr/include/aarch64-linux-gnu during cross compile and since arches | ||
| 12 | are so similar, cross compiler (epecially clang) is inhererently configured | ||
| 13 | with multiarch ends up adding these paths to compiler cmdline which | ||
| 14 | works ok with gcc since headers are similar but clang barfs on some gcc | ||
| 15 | extentions and build fails due to missing gnu extentions but it silently | ||
| 16 | compiles when using cross gcc. | ||
| 17 | |||
| 18 | Fixes python3 cross build by not running this funciton when cross compiling | ||
| 19 | |||
| 20 | Upstream-Status: Inappropriate [OE-Specific] | ||
| 21 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 22 | --- | ||
| 23 | setup.py | 3 ++- | ||
| 24 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
| 25 | |||
| 26 | diff --git a/setup.py b/setup.py | ||
| 27 | index 2e7f263..f7a3d39 100644 | ||
| 28 | --- a/setup.py | ||
| 29 | +++ b/setup.py | ||
| 30 | @@ -840,7 +840,8 @@ class PyBuildExt(build_ext): | ||
| 31 | # only change this for cross builds for 3.3, issues on Mageia | ||
| 32 | if CROSS_COMPILING: | ||
| 33 | self.add_cross_compiling_paths() | ||
| 34 | - self.add_multiarch_paths() | ||
| 35 | + if not CROSS_COMPILING: | ||
| 36 | + self.add_multiarch_paths() | ||
| 37 | self.add_ldflags_cppflags() | ||
| 38 | |||
| 39 | def init_inc_lib_dirs(self): | ||
| 40 | -- | ||
| 41 | 2.25.1 | ||
| 42 | |||
