diff options
author | Andrew Geissler <geissonator@yahoo.com> | 2020-04-13 21:39:40 +0300 |
---|---|---|
committer | Andrew Geissler <geissonator@yahoo.com> | 2020-05-05 16:30:44 +0300 |
commit | 82c905dc58a36aeae40b1b273a12f63fb1973cf4 (patch) | |
tree | 38caf00263451b5036435cdc36e035b25d32e623 /poky/meta/recipes-devtools/python/python3 | |
parent | 83ecb75644b3d677c274188f9ac0b2374d6f6925 (diff) | |
download | openbmc-82c905dc58a36aeae40b1b273a12f63fb1973cf4.tar.xz |
meta-openembedded and poky: subtree updates
Squash of the following due to dependencies among them
and OpenBMC changes:
meta-openembedded: subtree update:d0748372d2..9201611135
meta-openembedded: subtree update:9201611135..17fd382f34
poky: subtree update:9052e5b32a..2e11d97b6c
poky: subtree update:2e11d97b6c..a8544811d7
The change log was too large for the jenkins plugin
to handle therefore it has been removed. Here is
the first and last commit of each subtree:
meta-openembedded:d0748372d2
cppzmq: bump to version 4.6.0
meta-openembedded:17fd382f34
mpv: Remove X11 dependency
poky:9052e5b32a
package_ipk: Remove pointless comment to trigger rebuild
poky:a8544811d7
pbzip2: Fix license warning
Change-Id: If0fc6c37629642ee207a4ca2f7aa501a2c673cd6
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Diffstat (limited to 'poky/meta/recipes-devtools/python/python3')
19 files changed, 456 insertions, 468 deletions
diff --git a/poky/meta/recipes-devtools/python/python3/0001-Do-not-add-usr-lib-termcap-to-linker-flags-to-avoid-.patch b/poky/meta/recipes-devtools/python/python3/0001-Do-not-add-usr-lib-termcap-to-linker-flags-to-avoid-.patch index 09f279ba1d..59592821d7 100644 --- a/poky/meta/recipes-devtools/python/python3/0001-Do-not-add-usr-lib-termcap-to-linker-flags-to-avoid-.patch +++ b/poky/meta/recipes-devtools/python/python3/0001-Do-not-add-usr-lib-termcap-to-linker-flags-to-avoid-.patch @@ -1,4 +1,4 @@ -From 23294c6ba6896115828293fdb7e67b47b38ba675 Mon Sep 17 00:00:00 2001 +From 039c53dd5baddec3359a05be0bff46a3b32bbb84 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Fri, 25 Jan 2019 19:04:13 +0100 Subject: [PATCH] Do not add /usr/lib/termcap to linker flags to avoid host @@ -12,14 +12,14 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 1 file changed, 1 deletion(-) diff --git a/setup.py b/setup.py -index b4357e3..fbec00d 100644 +index 20d7f35..ab18ff0 100644 --- a/setup.py +++ b/setup.py -@@ -856,7 +856,6 @@ class PyBuildExt(build_ext): +@@ -957,7 +957,6 @@ class PyBuildExt(build_ext): 'termcap'): readline_libs.append('termcap') - exts.append( Extension('readline', ['readline.c'], -- library_dirs=['/usr/lib/termcap'], - extra_link_args=readline_extra_link_args, - libraries=readline_libs) ) + self.add(Extension('readline', ['readline.c'], +- library_dirs=['/usr/lib/termcap'], + extra_link_args=readline_extra_link_args, + libraries=readline_libs)) else: diff --git a/poky/meta/recipes-devtools/python/python3/0001-Do-not-hardcode-lib-as-location-for-site-packages-an.patch b/poky/meta/recipes-devtools/python/python3/0001-Do-not-hardcode-lib-as-location-for-site-packages-an.patch index ea75262c4f..112c979441 100644 --- a/poky/meta/recipes-devtools/python/python3/0001-Do-not-hardcode-lib-as-location-for-site-packages-an.patch +++ b/poky/meta/recipes-devtools/python/python3/0001-Do-not-hardcode-lib-as-location-for-site-packages-an.patch @@ -1,4 +1,4 @@ -From 0fbdad1eaf541a8e92be81f39514cd249b3b0801 Mon Sep 17 00:00:00 2001 +From a078b6ff1492e848ad1055764fb9a414abaf3e12 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Tue, 5 Feb 2019 15:52:02 +0100 Subject: [PATCH] Do not hardcode "lib" as location for modules, site-packages @@ -11,13 +11,13 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Include/pythonrun.h | 2 ++ Lib/site.py | 4 ++-- Makefile.pre.in | 5 +++-- - Modules/getpath.c | 18 ++++++++++++------ + Modules/getpath.c | 22 ++++++++++++++-------- Python/getplatform.c | 10 ++++++++++ Python/sysmodule.c | 2 ++ - 6 files changed, 31 insertions(+), 10 deletions(-) + 6 files changed, 33 insertions(+), 12 deletions(-) diff --git a/Include/pythonrun.h b/Include/pythonrun.h -index 6f0c6fc..0a17edd 100644 +index 46091e0..61b2e15 100644 --- a/Include/pythonrun.h +++ b/Include/pythonrun.h @@ -7,6 +7,8 @@ @@ -28,12 +28,12 @@ index 6f0c6fc..0a17edd 100644 + #ifndef Py_LIMITED_API PyAPI_FUNC(int) PyRun_SimpleStringFlags(const char *, PyCompilerFlags *); - PyAPI_FUNC(int) PyRun_AnyFileFlags(FILE *, const char *, PyCompilerFlags *); + PyAPI_FUNC(int) PyRun_AnyFileExFlags( diff --git a/Lib/site.py b/Lib/site.py -index ffd132b..b55f6d8 100644 +index a065ab0..1d720ef 100644 --- a/Lib/site.py +++ b/Lib/site.py -@@ -334,12 +334,12 @@ def getsitepackages(prefixes=None): +@@ -335,12 +335,12 @@ def getsitepackages(prefixes=None): seen.add(prefix) if os.sep == '/': @@ -49,10 +49,10 @@ index ffd132b..b55f6d8 100644 def addsitepackages(known_paths, prefixes=None): diff --git a/Makefile.pre.in b/Makefile.pre.in -index 6e81b2f..671a20e 100644 +index 65665df..be49140 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -142,7 +142,7 @@ LIBDIR= @libdir@ +@@ -143,7 +143,7 @@ LIBDIR= @libdir@ MANDIR= @mandir@ INCLUDEDIR= @includedir@ CONFINCLUDEDIR= $(exec_prefix)/include @@ -61,7 +61,7 @@ index 6e81b2f..671a20e 100644 ABIFLAGS= @ABIFLAGS@ # Detailed destination directories -@@ -768,6 +768,7 @@ Modules/getpath.o: $(srcdir)/Modules/getpath.c Makefile +@@ -753,6 +753,7 @@ Modules/getpath.o: $(srcdir)/Modules/getpath.c Makefile -DEXEC_PREFIX='"$(exec_prefix)"' \ -DVERSION='"$(VERSION)"' \ -DVPATH='"$(VPATH)"' \ @@ -69,7 +69,7 @@ index 6e81b2f..671a20e 100644 -o $@ $(srcdir)/Modules/getpath.c Programs/python.o: $(srcdir)/Programs/python.c -@@ -856,7 +857,7 @@ regen-opcode: +@@ -868,7 +869,7 @@ regen-symbol: $(srcdir)/Include/graminit.h Python/compile.o Python/symtable.o Python/ast_unparse.o Python/ast.o Python/future.o Parser/parsetok.o: $(srcdir)/Include/graminit.h $(srcdir)/Include/Python-ast.h Python/getplatform.o: $(srcdir)/Python/getplatform.c @@ -79,72 +79,90 @@ index 6e81b2f..671a20e 100644 Python/importdl.o: $(srcdir)/Python/importdl.c $(CC) -c $(PY_CORE_CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c diff --git a/Modules/getpath.c b/Modules/getpath.c -index e6a3e8e..0c62af6 100644 +index b727f66..c003e46 100644 --- a/Modules/getpath.c +++ b/Modules/getpath.c -@@ -123,6 +123,7 @@ typedef struct { - wchar_t *exec_prefix; /* EXEC_PREFIX define */ +@@ -128,6 +128,7 @@ typedef struct { + wchar_t *exec_prefix; /* EXEC_PREFIX macro */ wchar_t *lib_python; /* "lib/pythonX.Y" */ + wchar_t *multilib_python; /* "lib[suffix]/pythonX.Y" */ - wchar_t argv0_path[MAXPATHLEN+1]; - wchar_t zip_path[MAXPATHLEN+1]; /* ".../lib/pythonXY.zip" */ -@@ -314,7 +315,7 @@ search_for_prefix(const _PyCoreConfig *core_config, + int prefix_found; /* found platform independent libraries? */ + int exec_prefix_found; /* found the platform dependent libraries? */ +@@ -386,7 +387,7 @@ search_for_prefix(PyCalculatePath *calculate, _PyPathConfig *pathconfig, if (delim) { *delim = L'\0'; } -- joinpath(prefix, calculate->lib_python); -+ joinpath(prefix, calculate->multilib_python); - joinpath(prefix, LANDMARK); - return 1; - } -@@ -343,7 +344,7 @@ search_for_prefix(const _PyCoreConfig *core_config, - copy_absolute(prefix, calculate->argv0_path, MAXPATHLEN+1); +- status = joinpath(prefix, calculate->lib_python, prefix_len); ++ status = joinpath(prefix, calculate->multilib_python, prefix_len); + if (_PyStatus_EXCEPTION(status)) { + return status; + } +@@ -444,7 +445,7 @@ search_for_prefix(PyCalculatePath *calculate, _PyPathConfig *pathconfig, do { - n = wcslen(prefix); -- joinpath(prefix, calculate->lib_python); -+ joinpath(prefix, calculate->multilib_python); - joinpath(prefix, LANDMARK); - if (ismodule(prefix)) { - return 1; -@@ -355,7 +356,7 @@ search_for_prefix(const _PyCoreConfig *core_config, - /* Look at configure's PREFIX */ - wcsncpy(prefix, calculate->prefix, MAXPATHLEN); - prefix[MAXPATHLEN] = L'\0'; -- joinpath(prefix, calculate->lib_python); -+ joinpath(prefix, calculate->multilib_python); - joinpath(prefix, LANDMARK); - if (ismodule(prefix)) { - return 1; -@@ -427,7 +428,7 @@ search_for_exec_prefix(const _PyCoreConfig *core_config, - wcsncpy(exec_prefix, core_config->home, MAXPATHLEN); + /* Path: <argv0_path or substring> / <lib_python> / LANDMARK */ + size_t n = wcslen(prefix); +- status = joinpath(prefix, calculate->lib_python, prefix_len); ++ status = joinpath(prefix, calculate->multilib_python, prefix_len); + if (_PyStatus_EXCEPTION(status)) { + return status; } - exec_prefix[MAXPATHLEN] = L'\0'; -- joinpath(exec_prefix, calculate->lib_python); -+ joinpath(exec_prefix, calculate->multilib_python); - joinpath(exec_prefix, L"lib-dynload"); - return 1; +@@ -467,7 +468,7 @@ search_for_prefix(PyCalculatePath *calculate, _PyPathConfig *pathconfig, + if (safe_wcscpy(prefix, calculate->prefix, prefix_len) < 0) { + return PATHLEN_ERR(); + } +- status = joinpath(prefix, calculate->lib_python, prefix_len); ++ status = joinpath(prefix, calculate->multilib_python, prefix_len); + if (_PyStatus_EXCEPTION(status)) { + return status; } -@@ -464,7 +465,7 @@ search_for_exec_prefix(const _PyCoreConfig *core_config, - copy_absolute(exec_prefix, calculate->argv0_path, MAXPATHLEN+1); +@@ -510,7 +511,7 @@ calculate_prefix(PyCalculatePath *calculate, _PyPathConfig *pathconfig, + if (safe_wcscpy(prefix, calculate->prefix, prefix_len) < 0) { + return PATHLEN_ERR(); + } +- status = joinpath(prefix, calculate->lib_python, prefix_len); ++ status = joinpath(prefix, calculate->multilib_python, prefix_len); + if (_PyStatus_EXCEPTION(status)) { + return status; + } +@@ -635,7 +636,7 @@ search_for_exec_prefix(PyCalculatePath *calculate, _PyPathConfig *pathconfig, + return PATHLEN_ERR(); + } + } +- status = joinpath(exec_prefix, calculate->lib_python, exec_prefix_len); ++ status = joinpath(exec_prefix, calculate->multilib_python, exec_prefix_len); + if (_PyStatus_EXCEPTION(status)) { + return status; + } +@@ -667,7 +668,7 @@ search_for_exec_prefix(PyCalculatePath *calculate, _PyPathConfig *pathconfig, do { - n = wcslen(exec_prefix); -- joinpath(exec_prefix, calculate->lib_python); -+ joinpath(exec_prefix, calculate->multilib_python); - joinpath(exec_prefix, L"lib-dynload"); - if (isdir(exec_prefix)) { - return 1; -@@ -476,7 +477,7 @@ search_for_exec_prefix(const _PyCoreConfig *core_config, - /* Look at configure's EXEC_PREFIX */ - wcsncpy(exec_prefix, calculate->exec_prefix, MAXPATHLEN); - exec_prefix[MAXPATHLEN] = L'\0'; -- joinpath(exec_prefix, calculate->lib_python); -+ joinpath(exec_prefix, calculate->multilib_python); - joinpath(exec_prefix, L"lib-dynload"); - if (isdir(exec_prefix)) { - return 1; -@@ -871,6 +872,10 @@ calculate_init(PyCalculatePath *calculate, + /* Path: <argv0_path or substring> / <lib_python> / "lib-dynload" */ + size_t n = wcslen(exec_prefix); +- status = joinpath(exec_prefix, calculate->lib_python, exec_prefix_len); ++ status = joinpath(exec_prefix, calculate->multilib_python, exec_prefix_len); + if (_PyStatus_EXCEPTION(status)) { + return status; + } +@@ -689,7 +690,7 @@ search_for_exec_prefix(PyCalculatePath *calculate, _PyPathConfig *pathconfig, + if (safe_wcscpy(exec_prefix, calculate->exec_prefix, exec_prefix_len) < 0) { + return PATHLEN_ERR(); + } +- status = joinpath(exec_prefix, calculate->lib_python, exec_prefix_len); ++ status = joinpath(exec_prefix, calculate->multilib_python, exec_prefix_len); + if (_PyStatus_EXCEPTION(status)) { + return status; + } +@@ -928,7 +929,7 @@ calculate_argv0_path(PyCalculatePath *calculate, const wchar_t *program_full_pat + return PATHLEN_ERR(); + } + reduce(argv0_path); +- status = joinpath(argv0_path, calculate->lib_python, argv0_path_len); ++ status = joinpath(argv0_path, calculate->multilib_python, argv0_path_len); + if (_PyStatus_EXCEPTION(status)) { + PyMem_RawFree(wbuf); + return status; +@@ -1201,6 +1202,10 @@ calculate_init(PyCalculatePath *calculate, const PyConfig *config) if (!calculate->lib_python) { return DECODE_LOCALE_ERR("EXEC_PREFIX define", len); } @@ -152,10 +170,10 @@ index e6a3e8e..0c62af6 100644 + if (!calculate->multilib_python) { + return DECODE_LOCALE_ERR("EXEC_PREFIX define", len); + } - return _Py_INIT_OK(); - } -@@ -882,6 +887,7 @@ calculate_free(PyCalculatePath *calculate) + calculate->warnings = config->pathconfig_warnings; + calculate->pythonpath_env = config->pythonpath_env; +@@ -1216,6 +1221,7 @@ calculate_free(PyCalculatePath *calculate) PyMem_RawFree(calculate->prefix); PyMem_RawFree(calculate->exec_prefix); PyMem_RawFree(calculate->lib_python); @@ -182,10 +200,10 @@ index 81a0f7a..d55396b 100644 + return LIB; +} diff --git a/Python/sysmodule.c b/Python/sysmodule.c -index efe5b29..de77b17 100644 +index 5b0fb81..0dce754 100644 --- a/Python/sysmodule.c +++ b/Python/sysmodule.c -@@ -2319,6 +2319,8 @@ _PySys_BeginInit(PyObject **sysmod) +@@ -2668,6 +2668,8 @@ _PySys_InitCore(_PyRuntimeState *runtime, PyInterpreterState *interp, PyUnicode_FromString(Py_GetCopyright())); SET_SYS_FROM_STRING("platform", PyUnicode_FromString(Py_GetPlatform())); diff --git a/poky/meta/recipes-devtools/python/python3/0001-Don-t-search-system-for-headers-libraries.patch b/poky/meta/recipes-devtools/python/python3/0001-Don-t-search-system-for-headers-libraries.patch new file mode 100644 index 0000000000..acf8e1e9b5 --- /dev/null +++ b/poky/meta/recipes-devtools/python/python3/0001-Don-t-search-system-for-headers-libraries.patch @@ -0,0 +1,29 @@ +From 85e8f86ad2b7dec0848cd55b8e810a5e2722b20a Mon Sep 17 00:00:00 2001 +From: Jeremy Puhlman <jpuhlman@mvista.com> +Date: Wed, 4 Mar 2020 00:06:42 +0000 +Subject: [PATCH] Don't search system for headers/libraries + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com> +--- + setup.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/setup.py b/setup.py +index 9da1b3a..59782c0 100644 +--- a/setup.py ++++ b/setup.py +@@ -674,8 +674,8 @@ class PyBuildExt(build_ext): + add_dir_to_list(self.compiler.include_dirs, + sysconfig.get_config_var("INCLUDEDIR")) + +- system_lib_dirs = ['/lib64', '/usr/lib64', '/lib', '/usr/lib'] +- system_include_dirs = ['/usr/include'] ++ system_lib_dirs = [] ++ system_include_dirs = [] + # lib_dirs and inc_dirs are used to search for files; + # if a file is found in one of those directories, it can + # be assumed that no additional -I,-L directives are needed. +-- +2.24.1 + diff --git a/poky/meta/recipes-devtools/python/python3/0001-Makefile-do-not-compile-.pyc-in-parallel.patch b/poky/meta/recipes-devtools/python/python3/0001-Makefile-do-not-compile-.pyc-in-parallel.patch new file mode 100644 index 0000000000..b1bceac512 --- /dev/null +++ b/poky/meta/recipes-devtools/python/python3/0001-Makefile-do-not-compile-.pyc-in-parallel.patch @@ -0,0 +1,58 @@ +From c501e121a872cbcef8ffe626c1de173a125be9f8 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Thu, 16 Jan 2020 12:34:20 +0100 +Subject: [PATCH] Makefile: do not compile .pyc in parallel + +This was found to break reproducibility, and produce strange file ownership +races. + +The upstream commit introducing the change was: +https://github.com/python/cpython/commit/1a2dd82f56bd813aacc570e172cefe55a8a41504 + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + Makefile.pre.in | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/Makefile.pre.in b/Makefile.pre.in +index 1241112..5dfdf44 100644 +--- a/Makefile.pre.in ++++ b/Makefile.pre.in +@@ -1457,30 +1457,30 @@ libinstall: build_all $(srcdir)/Modules/xxmodule.c + fi + -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ + $(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \ +- -j0 -d $(LIBDEST) -f \ ++ -d $(LIBDEST) -f \ + -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ + $(DESTDIR)$(LIBDEST) + -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ + $(PYTHON_FOR_BUILD) -Wi -O $(DESTDIR)$(LIBDEST)/compileall.py \ +- -j0 -d $(LIBDEST) -f \ ++ -d $(LIBDEST) -f \ + -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ + $(DESTDIR)$(LIBDEST) + -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ + $(PYTHON_FOR_BUILD) -Wi -OO $(DESTDIR)$(LIBDEST)/compileall.py \ +- -j0 -d $(LIBDEST) -f \ ++ -d $(LIBDEST) -f \ + -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ + $(DESTDIR)$(LIBDEST) + -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ + $(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \ +- -j0 -d $(LIBDEST)/site-packages -f \ ++ -d $(LIBDEST)/site-packages -f \ + -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages + -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ + $(PYTHON_FOR_BUILD) -Wi -O $(DESTDIR)$(LIBDEST)/compileall.py \ +- -j0 -d $(LIBDEST)/site-packages -f \ ++ -d $(LIBDEST)/site-packages -f \ + -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages + -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ + $(PYTHON_FOR_BUILD) -Wi -OO $(DESTDIR)$(LIBDEST)/compileall.py \ +- -j0 -d $(LIBDEST)/site-packages -f \ ++ -d $(LIBDEST)/site-packages -f \ + -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages + -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ + $(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt diff --git a/poky/meta/recipes-devtools/python/python3/0001-bpo-36852-proper-detection-of-mips-architecture-for-.patch b/poky/meta/recipes-devtools/python/python3/0001-bpo-36852-proper-detection-of-mips-architecture-for-.patch index e7af88654d..c4fae09a5b 100644 --- a/poky/meta/recipes-devtools/python/python3/0001-bpo-36852-proper-detection-of-mips-architecture-for-.patch +++ b/poky/meta/recipes-devtools/python/python3/0001-bpo-36852-proper-detection-of-mips-architecture-for-.patch @@ -1,4 +1,4 @@ -From 7535c39951b9d15dd64c4669092a8582ba555466 Mon Sep 17 00:00:00 2001 +From 1ad771d86728ee2ed30e202e9768d8d825f96467 Mon Sep 17 00:00:00 2001 From: Matthias Schoepfer <matthias.schoepfer@ithinx.io> Date: Fri, 31 May 2019 15:34:34 +0200 Subject: [PATCH] bpo-36852: proper detection of mips architecture for soft @@ -12,15 +12,17 @@ to do this in a more autoconf/autotools manner. Upstream-Status: Submitted [https://github.com/python/cpython/pull/13196] Signed-off-by: Matthias Schoepfer <matthias.schoepfer@ithinx.io> + +%% original patch: 0001-bpo-36852-proper-detection-of-mips-architecture-for-.patch --- - configure.ac | 169 ++++++--------------------------------------------- - 1 file changed, 17 insertions(+), 152 deletions(-) + configure.ac | 175 +++++++-------------------------------------------- + 1 file changed, 21 insertions(+), 154 deletions(-) diff --git a/configure.ac b/configure.ac -index a7de901e08..a73e2de51b 100644 +index ede710e..bc81b0b 100644 --- a/configure.ac +++ b/configure.ac -@@ -727,158 +727,23 @@ fi +@@ -710,160 +710,27 @@ fi MULTIARCH=$($CC --print-multiarch 2>/dev/null) AC_SUBST(MULTIARCH) @@ -163,6 +165,8 @@ index a7de901e08..a73e2de51b 100644 - i386-gnu -#elif defined(__APPLE__) - darwin +-#elif defined(__VXWORKS__) +- vxworks -#else -# error unknown platform triplet -#endif @@ -190,12 +194,16 @@ index a7de901e08..a73e2de51b 100644 + PLATFORM_TRIPLET=vxworks + ;; + *) -+ PLATFORM_TRIPLET=${target_cpu}-${target_os} ++ if test "${target_cpu}" != "i686"; then ++ PLATFORM_TRIPLET=${target_cpu}-${target_os} ++ else ++ PLATFORM_TRIPLET=i386-${target_os} ++ fi + ;; +esac if test x$PLATFORM_TRIPLET != x && test x$MULTIARCH != x; then if test x$PLATFORM_TRIPLET != x$MULTIARCH; then -- -2.21.0 +2.24.1 diff --git a/poky/meta/recipes-devtools/python/python3/0001-configure.ac-fix-LIBPL.patch b/poky/meta/recipes-devtools/python/python3/0001-configure.ac-fix-LIBPL.patch new file mode 100644 index 0000000000..123ce3a2dc --- /dev/null +++ b/poky/meta/recipes-devtools/python/python3/0001-configure.ac-fix-LIBPL.patch @@ -0,0 +1,35 @@ +From acce3d441e7eadadd2d3ce38654155dc43f1f607 Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Fri, 7 Feb 2020 09:36:25 +0800 +Subject: [PATCH] configure.ac: fix LIBPL + +Use LIBDIR rather than prefix/lib, so that it would work when lib64. + +Upstream-Status: Inappropriate [oe-core specific] + +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> +Signed-off-by: Li Zhou <li.zhou@windriver.c> +Signed-off-by: Changqing Li <changqing.li@windriver.com> +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index ce04258..915f475 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -4532,9 +4532,9 @@ fi + dnl define LIBPL after ABIFLAGS and LDVERSION is defined. + AC_SUBST(PY_ENABLE_SHARED) + if test x$PLATFORM_TRIPLET = x; then +- LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}" ++ LIBPL='$(LIBDIR)'"/python${VERSION}/config-${LDVERSION}" + else +- LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}-${PLATFORM_TRIPLET}" ++ LIBPL='$(LIBDIR)'"/python${VERSION}/config-${LDVERSION}-${PLATFORM_TRIPLET}" + fi + AC_SUBST(LIBPL) + +-- +2.7.4 + diff --git a/poky/meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch b/poky/meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch index 1709011be8..e7af3c6f5c 100644 --- a/poky/meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch +++ b/poky/meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch @@ -1,4 +1,4 @@ -From eff903c600f4c40f5753e95ab1557126fc6e0c9c Mon Sep 17 00:00:00 2001 +From 7ada9c749f6beb51c13a3debc850755e911548a6 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Thu, 31 Jan 2019 16:46:30 +0100 Subject: [PATCH] distutils/sysconfig: append @@ -15,10 +15,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 2 files changed, 4 insertions(+) diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py -index 0a034ee..3dfd0a3 100644 +index b51629e..2df348c 100644 --- a/Lib/distutils/sysconfig.py +++ b/Lib/distutils/sysconfig.py -@@ -439,6 +439,8 @@ def _init_posix(): +@@ -438,6 +438,8 @@ def _init_posix(): platform=sys.platform, multiarch=getattr(sys.implementation, '_multiarch', ''), )) @@ -28,7 +28,7 @@ index 0a034ee..3dfd0a3 100644 build_time_vars = _temp.build_time_vars global _config_vars diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py -index 87fa5e6..756a41c 100644 +index b2d790b..405273c 100644 --- a/Lib/sysconfig.py +++ b/Lib/sysconfig.py @@ -419,6 +419,8 @@ def _init_posix(vars): diff --git a/poky/meta/recipes-devtools/python/python3/0001-main.c-if-OEPYTHON3HOME-is-set-use-instead-of-PYTHON.patch b/poky/meta/recipes-devtools/python/python3/0001-main.c-if-OEPYTHON3HOME-is-set-use-instead-of-PYTHON.patch deleted file mode 100644 index a146c747f8..0000000000 --- a/poky/meta/recipes-devtools/python/python3/0001-main.c-if-OEPYTHON3HOME-is-set-use-instead-of-PYTHON.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 5ce3ac59531828ff682646fbba59b2126b28a8aa Mon Sep 17 00:00:00 2001 -From: Jaewon Lee <jaewon.lee@xilinx.com> -Date: Thu, 25 Apr 2019 15:34:26 -0700 -Subject: [PATCH] main.c: if OEPYTHON3HOME is set use instead of PYTHONHOME - -There is one variable PYTHONHOME to determine where libraries are coming -from for both python2 and python3. This becomes an issue if only one has -libraries in the specified PYTHONHOME path, but they are using the same -PYTHONHOME. Creating another variable OEPYTHON3HOME to allow for a way -to set a different path for python3 - -Signed-off-by: Jaewon Lee <jaewon.lee@xilinx.com> - -Upstream-Status: Inappropriate [OE specific configuration] - ---- - Modules/main.c | 17 +++++++++++++---- - 1 file changed, 13 insertions(+), 4 deletions(-) - -diff --git a/Modules/main.c b/Modules/main.c -index acc59c6..407085a 100644 ---- a/Modules/main.c -+++ b/Modules/main.c -@@ -1834,10 +1834,19 @@ config_init_home(_PyCoreConfig *config) - } - return _Py_INIT_OK(); - } -- -- int res = config_get_env_var_dup(&home, L"PYTHONHOME", "PYTHONHOME"); -- if (res < 0) { -- return DECODE_LOCALE_ERR("PYTHONHOME", res); -+ int res; -+ const char *oepython3home = config_get_env_var("OEPYTHON3HOME"); -+ if (oepython3home) { -+ res = config_get_env_var_dup(&home, L"OEPYTHON3HOME", "OEPYTHON3HOME"); -+ if (res < 0) { -+ return DECODE_LOCALE_ERR("OEPYTHON3HOME", res); -+ } -+ } -+ else { -+ res = config_get_env_var_dup(&home, L"PYTHONHOME", "PYTHONHOME"); -+ if (res < 0) { -+ return DECODE_LOCALE_ERR("PYTHONHOME", res); -+ } - } - config->home = home; - return _Py_INIT_OK(); diff --git a/poky/meta/recipes-devtools/python/python3/0001-python3-Do-not-hardcode-lib-for-distutils.patch b/poky/meta/recipes-devtools/python/python3/0001-python3-Do-not-hardcode-lib-for-distutils.patch new file mode 100644 index 0000000000..fe031b9983 --- /dev/null +++ b/poky/meta/recipes-devtools/python/python3/0001-python3-Do-not-hardcode-lib-for-distutils.patch @@ -0,0 +1,43 @@ +From bb711b53f10d32a90a27ccf4b0dc51e4a701d862 Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Fri, 7 Feb 2020 09:42:09 +0800 +Subject: [PATCH] python3: Do not hardcode "lib" for distutils + +Get the sys.lib from python3 itself and do not use +hardcoded value of 'lib' for distutils. + +Upstream-Status: Inappropriate [oe-core specific] + +Signed-off-by: Li Zhou <li.zhou@windriver.com> +Signed-off-by: Changqing Li <changqing.li@windriver.com> +--- + Lib/distutils/command/install.py | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/Lib/distutils/command/install.py b/Lib/distutils/command/install.py +index c625c95..8e32f54 100644 +--- a/Lib/distutils/command/install.py ++++ b/Lib/distutils/command/install.py +@@ -19,6 +19,8 @@ from site import USER_BASE + from site import USER_SITE + HAS_USER_SITE = True + ++libname = sys.lib ++ + WINDOWS_SCHEME = { + 'purelib': '$base/Lib/site-packages', + 'platlib': '$base/Lib/site-packages', +@@ -29,8 +31,8 @@ WINDOWS_SCHEME = { + + INSTALL_SCHEMES = { + 'unix_prefix': { +- 'purelib': '$base/lib/python$py_version_short/site-packages', +- 'platlib': '$platbase/lib/python$py_version_short/site-packages', ++ 'purelib': '$base/' + libname + '/python$py_version_short/site-packages', ++ 'platlib': '$platbase/' + libname + '/python$py_version_short/site-packages', + 'headers': '$base/include/python$py_version_short$abiflags/$dist_name', + 'scripts': '$base/bin', + 'data' : '$base', +-- +2.7.4 + diff --git a/poky/meta/recipes-devtools/python/python3/0001-python3-use-cc_basename-to-replace-CC-for-checking-c.patch b/poky/meta/recipes-devtools/python/python3/0001-python3-use-cc_basename-to-replace-CC-for-checking-c.patch index a0ea897f4e..fb10ca94b3 100644 --- a/poky/meta/recipes-devtools/python/python3/0001-python3-use-cc_basename-to-replace-CC-for-checking-c.patch +++ b/poky/meta/recipes-devtools/python/python3/0001-python3-use-cc_basename-to-replace-CC-for-checking-c.patch @@ -1,4 +1,4 @@ -From 2645317fef09afe31b01bb2c1d4fe5b9afdbb11a Mon Sep 17 00:00:00 2001 +From 994783da5c21cab81b6589ed2d4275e665a946f9 Mon Sep 17 00:00:00 2001 From: Changqing Li <changqing.li@windriver.com> Date: Mon, 22 Oct 2018 15:19:51 +0800 Subject: [PATCH] python3: use cc_basename to replace CC for checking compiler @@ -21,12 +21,13 @@ Signed-off-by: Li Zhou <li.zhou@windriver.com> patch originally from Li Zhou, I just rework it to new version Signed-off-by: Changqing Li <changqing.li@windriver.com> + --- configure.ac | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/configure.ac b/configure.ac -index a7de901..4a3681f 100644 +index a189d42..0f85486 100644 --- a/configure.ac +++ b/configure.ac @@ -54,6 +54,7 @@ AC_CONFIG_HEADER(pyconfig.h) @@ -37,7 +38,7 @@ index a7de901..4a3681f 100644 # pybuilddir.txt will be created by --generate-posix-vars in the Makefile rm -f pybuilddir.txt -@@ -695,7 +696,7 @@ AC_MSG_RESULT($with_cxx_main) +@@ -671,7 +672,7 @@ AC_MSG_RESULT($with_cxx_main) preset_cxx="$CXX" if test -z "$CXX" then @@ -46,7 +47,7 @@ index a7de901..4a3681f 100644 gcc) AC_PATH_TOOL(CXX, [g++], [g++], [notfound]) ;; cc) AC_PATH_TOOL(CXX, [c++], [c++], [notfound]) ;; clang|*/clang) AC_PATH_TOOL(CXX, [clang++], [clang++], [notfound]) ;; -@@ -979,7 +980,7 @@ rmdir CaseSensitiveTestDir +@@ -957,7 +958,7 @@ rmdir CaseSensitiveTestDir case $ac_sys_system in hp*|HP*) @@ -55,7 +56,7 @@ index a7de901..4a3681f 100644 cc|*/cc) CC="$CC -Ae";; esac;; esac -@@ -1336,7 +1337,7 @@ else +@@ -1335,7 +1336,7 @@ else fi], [AC_MSG_RESULT(no)]) if test "$Py_LTO" = 'true' ; then @@ -64,7 +65,7 @@ index a7de901..4a3681f 100644 *clang*) AC_SUBST(LLVM_AR) AC_PATH_TOOL(LLVM_AR, llvm-ar, '', ${llvm_path}) -@@ -1426,7 +1427,7 @@ then +@@ -1425,7 +1426,7 @@ then fi fi LLVM_PROF_ERR=no @@ -73,16 +74,16 @@ index a7de901..4a3681f 100644 *clang*) # Any changes made here should be reflected in the GCC+Darwin case below PGO_PROF_GEN_FLAG="-fprofile-instr-generate" -@@ -1500,7 +1501,7 @@ then - WRAP="-fwrapv" - fi +@@ -1486,7 +1487,7 @@ esac + # compiler and platform. BASECFLAGS tweaks need to be made even if the + # user set OPT. -- case $CC in -+ case $cc_basename in - *clang*) - cc_is_clang=1 - ;; -@@ -1623,7 +1624,7 @@ yes) +-case $CC in ++case $cc_basename in + *clang*) + cc_is_clang=1 + ;; +@@ -1622,7 +1623,7 @@ yes) # ICC doesn't recognize the option, but only emits a warning ## XXX does it emit an unused result warning and can it be disabled? @@ -91,7 +92,7 @@ index a7de901..4a3681f 100644 *icc*) ac_cv_disable_unused_result_warning=no ;; -@@ -1965,7 +1966,7 @@ yes) +@@ -1943,7 +1944,7 @@ yes) esac # ICC needs -fp-model strict or floats behave badly @@ -100,7 +101,7 @@ index a7de901..4a3681f 100644 *icc*) CFLAGS_NODIST="$CFLAGS_NODIST -fp-model strict" ;; -@@ -2727,7 +2728,7 @@ then +@@ -2711,7 +2712,7 @@ then then LINKFORSHARED="-Wl,--export-dynamic" fi;; @@ -109,7 +110,7 @@ index a7de901..4a3681f 100644 *gcc*) if $CC -Xlinker --help 2>&1 | grep export-dynamic >/dev/null then -@@ -5429,7 +5430,7 @@ if test "$have_gcc_asm_for_x87" = yes; then +@@ -5362,7 +5363,7 @@ if test "$have_gcc_asm_for_x87" = yes; then # Some versions of gcc miscompile inline asm: # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46491 # http://gcc.gnu.org/ml/gcc/2010-11/msg00366.html diff --git a/poky/meta/recipes-devtools/python/python3/0003-setup.py-pass-missing-libraries-to-Extension-for-mul.patch b/poky/meta/recipes-devtools/python/python3/0001-setup.py-pass-missing-libraries-to-Extension-for-mul.patch index b9d5bc9c51..d38ed61dd7 100644 --- a/poky/meta/recipes-devtools/python/python3/0003-setup.py-pass-missing-libraries-to-Extension-for-mul.patch +++ b/poky/meta/recipes-devtools/python/python3/0001-setup.py-pass-missing-libraries-to-Extension-for-mul.patch @@ -1,6 +1,6 @@ -From b881a79adcd4ae5ac8fe4f49d0fc77c47f777919 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Fri, 4 Aug 2017 11:16:14 +0800 +From 7019ba184b828ed7253750cf409fc5760ef90a54 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Thu, 9 Jan 2020 17:44:05 +0100 Subject: [PATCH] setup.py: pass missing libraries to Extension for multiprocessing module @@ -46,35 +46,24 @@ ValueError: semaphore or lock released too many times And the semaphore issue also caused multiprocessing.Queue().put() hung. -Upstream-Status: Submitted [https://github.com/python/cpython/pull/2999] +Upstream-Status: Pensing Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> --- - setup.py | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) + setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py -index b7a36a6..658ead3 100644 +index ec3f2a4..b0f1541 100644 --- a/setup.py +++ b/setup.py -@@ -1584,8 +1584,10 @@ class PyBuildExt(build_ext): - elif host_platform.startswith('netbsd'): - macros = dict() - libraries = [] -- -- else: # Linux and other unices -+ elif host_platform.startswith(('linux')): -+ macros = dict() -+ libraries = ['pthread'] -+ else: # Other unices - macros = dict() - libraries = ['rt'] +@@ -1671,7 +1671,7 @@ class PyBuildExt(build_ext): + libraries=libs, + include_dirs=["Modules/_multiprocessing"])) -@@ -1603,6 +1605,7 @@ class PyBuildExt(build_ext): - - exts.append ( Extension('_multiprocessing', multiprocessing_srcs, - define_macros=list(macros.items()), -+ libraries=libraries, - include_dirs=["Modules/_multiprocessing"])) - # End multiprocessing +- self.add(Extension('_multiprocessing', multiprocessing_srcs, ++ self.add(Extension('_multiprocessing', multiprocessing_srcs, libraries=['pthread'], + include_dirs=["Modules/_multiprocessing"])) + def detect_uuid(self): diff --git a/poky/meta/recipes-devtools/python/python3/0002-Don-t-do-runtime-test-to-get-float-byte-order.patch b/poky/meta/recipes-devtools/python/python3/0002-Don-t-do-runtime-test-to-get-float-byte-order.patch deleted file mode 100644 index 3721e7c2aa..0000000000 --- a/poky/meta/recipes-devtools/python/python3/0002-Don-t-do-runtime-test-to-get-float-byte-order.patch +++ /dev/null @@ -1,199 +0,0 @@ -From fa96a7fd19e17b9c6b4dd01c3c3774fb382dddc6 Mon Sep 17 00:00:00 2001 -From: Ross Burton <ross.burton@intel.com> -Date: Wed, 5 Sep 2018 11:45:52 +0100 -Subject: [PATCH] Don't do runtime test to get float byte order - -Python uses AC_RUN_IFELSE to determine the byte order for floats and doubles, -and falls back onto "I don't know" if it can't run code. This results in -crippled floating point numbers in Python, and the regression tests fail. - -Instead of running code, take a macro from autoconf-archive which compiles C -with a special double in which has an ASCII representation, and then greps the -binary to identify the format. - -Upstream-Status: Submitted [https://bugs.python.org/issue34585] -Signed-off-by: Ross Burton <ross.burton@intel.com> ---- - configure.ac | 72 +++------------------------ - m4/ax_c_float_words_bigendian.m4 | 83 ++++++++++++++++++++++++++++++++ - 2 files changed, 90 insertions(+), 65 deletions(-) - create mode 100644 m4/ax_c_float_words_bigendian.m4 - -diff --git a/configure.ac b/configure.ac -index 4a3681f..4ab19a6 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -4328,77 +4328,19 @@ fi - # * Check for various properties of floating point * - # ************************************************** - --AC_MSG_CHECKING(whether C doubles are little-endian IEEE 754 binary64) --AC_CACHE_VAL(ac_cv_little_endian_double, [ --AC_RUN_IFELSE([AC_LANG_SOURCE([[ --#include <string.h> --int main() { -- double x = 9006104071832581.0; -- if (memcmp(&x, "\x05\x04\x03\x02\x01\xff\x3f\x43", 8) == 0) -- return 0; -- else -- return 1; --} --]])], --[ac_cv_little_endian_double=yes], --[ac_cv_little_endian_double=no], --[ac_cv_little_endian_double=no])]) --AC_MSG_RESULT($ac_cv_little_endian_double) --if test "$ac_cv_little_endian_double" = yes --then -- AC_DEFINE(DOUBLE_IS_LITTLE_ENDIAN_IEEE754, 1, -- [Define if C doubles are 64-bit IEEE 754 binary format, stored -- with the least significant byte first]) --fi -- --AC_MSG_CHECKING(whether C doubles are big-endian IEEE 754 binary64) --AC_CACHE_VAL(ac_cv_big_endian_double, [ --AC_RUN_IFELSE([AC_LANG_SOURCE([[ --#include <string.h> --int main() { -- double x = 9006104071832581.0; -- if (memcmp(&x, "\x43\x3f\xff\x01\x02\x03\x04\x05", 8) == 0) -- return 0; -- else -- return 1; --} --]])], --[ac_cv_big_endian_double=yes], --[ac_cv_big_endian_double=no], --[ac_cv_big_endian_double=no])]) --AC_MSG_RESULT($ac_cv_big_endian_double) --if test "$ac_cv_big_endian_double" = yes -+AX_C_FLOAT_WORDS_BIGENDIAN -+if test "$ax_cv_c_float_words_bigendian" = "yes" - then - AC_DEFINE(DOUBLE_IS_BIG_ENDIAN_IEEE754, 1, - [Define if C doubles are 64-bit IEEE 754 binary format, stored - with the most significant byte first]) --fi -- --# Some ARM platforms use a mixed-endian representation for doubles. --# While Python doesn't currently have full support for these platforms --# (see e.g., issue 1762561), we can at least make sure that float <-> string --# conversions work. --AC_MSG_CHECKING(whether C doubles are ARM mixed-endian IEEE 754 binary64) --AC_CACHE_VAL(ac_cv_mixed_endian_double, [ --AC_RUN_IFELSE([AC_LANG_SOURCE([[ --#include <string.h> --int main() { -- double x = 9006104071832581.0; -- if (memcmp(&x, "\x01\xff\x3f\x43\x05\x04\x03\x02", 8) == 0) -- return 0; -- else -- return 1; --} --]])], --[ac_cv_mixed_endian_double=yes], --[ac_cv_mixed_endian_double=no], --[ac_cv_mixed_endian_double=no])]) --AC_MSG_RESULT($ac_cv_mixed_endian_double) --if test "$ac_cv_mixed_endian_double" = yes -+elif test "$ax_cv_c_float_words_bigendian" = "no" - then -- AC_DEFINE(DOUBLE_IS_ARM_MIXED_ENDIAN_IEEE754, 1, -+ AC_DEFINE(DOUBLE_IS_LITTLE_ENDIAN_IEEE754, 1, - [Define if C doubles are 64-bit IEEE 754 binary format, stored -- in ARM mixed-endian order (byte order 45670123)]) -+ with the least significant byte first]) -+else -+ AC_MSG_ERROR([Cannot identify floating point byte order]) - fi - - # The short float repr introduced in Python 3.1 requires the -diff --git a/m4/ax_c_float_words_bigendian.m4 b/m4/ax_c_float_words_bigendian.m4 -new file mode 100644 -index 0000000..216b90d ---- /dev/null -+++ b/m4/ax_c_float_words_bigendian.m4 -@@ -0,0 +1,83 @@ -+# =============================================================================== -+# https://www.gnu.org/software/autoconf-archive/ax_c_float_words_bigendian.html -+# =============================================================================== -+# -+# SYNOPSIS -+# -+# AX_C_FLOAT_WORDS_BIGENDIAN([ACTION-IF-TRUE], [ACTION-IF-FALSE], [ACTION-IF-UNKNOWN]) -+# -+# DESCRIPTION -+# -+# Checks the ordering of words within a multi-word float. This check is -+# necessary because on some systems (e.g. certain ARM systems), the float -+# word ordering can be different from the byte ordering. In a multi-word -+# float context, "big-endian" implies that the word containing the sign -+# bit is found in the memory location with the lowest address. This -+# implementation was inspired by the AC_C_BIGENDIAN macro in autoconf. -+# -+# The endianness is detected by first compiling C code that contains a -+# special double float value, then grepping the resulting object file for -+# certain strings of ASCII values. The double is specially crafted to have -+# a binary representation that corresponds with a simple string. In this -+# implementation, the string "noonsees" was selected because the -+# individual word values ("noon" and "sees") are palindromes, thus making -+# this test byte-order agnostic. If grep finds the string "noonsees" in -+# the object file, the target platform stores float words in big-endian -+# order. If grep finds "seesnoon", float words are in little-endian order. -+# If neither value is found, the user is instructed to specify the -+# ordering. -+# -+# LICENSE -+# -+# Copyright (c) 2008 Daniel Amelang <dan@amelang.net> -+# -+# Copying and distribution of this file, with or without modification, are -+# permitted in any medium without royalty provided the copyright notice -+# and this notice are preserved. This file is offered as-is, without any -+# warranty. -+ -+#serial 11 -+ -+AC_DEFUN([AX_C_FLOAT_WORDS_BIGENDIAN], -+ [AC_CACHE_CHECK(whether float word ordering is bigendian, -+ ax_cv_c_float_words_bigendian, [ -+ -+ax_cv_c_float_words_bigendian=unknown -+AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ -+ -+double d = 90904234967036810337470478905505011476211692735615632014797120844053488865816695273723469097858056257517020191247487429516932130503560650002327564517570778480236724525140520121371739201496540132640109977779420565776568942592.0; -+ -+]])], [ -+ -+if grep noonsees conftest.$ac_objext >/dev/null ; then -+ ax_cv_c_float_words_bigendian=yes -+fi -+if grep seesnoon conftest.$ac_objext >/dev/null ; then -+ if test "$ax_cv_c_float_words_bigendian" = unknown; then -+ ax_cv_c_float_words_bigendian=no -+ else -+ ax_cv_c_float_words_bigendian=unknown -+ fi -+fi -+ -+])]) -+ -+case $ax_cv_c_float_words_bigendian in -+ yes) -+ m4_default([$1], -+ [AC_DEFINE([FLOAT_WORDS_BIGENDIAN], 1, -+ [Define to 1 if your system stores words within floats -+ with the most significant word first])]) ;; -+ no) -+ $2 ;; -+ *) -+ m4_default([$3], -+ [AC_MSG_ERROR([ -+ -+Unknown float word ordering. You need to manually preset -+ax_cv_c_float_words_bigendian=no (or yes) according to your system. -+ -+ ])]) ;; -+esac -+ -+])# AX_C_FLOAT_WORDS_BIGENDIAN diff --git a/poky/meta/recipes-devtools/python/python3/0017-setup.py-do-not-report-missing-dependencies-for-disa.patch b/poky/meta/recipes-devtools/python/python3/0017-setup.py-do-not-report-missing-dependencies-for-disa.patch index c15295c034..4bd98f62fd 100644 --- a/poky/meta/recipes-devtools/python/python3/0017-setup.py-do-not-report-missing-dependencies-for-disa.patch +++ b/poky/meta/recipes-devtools/python/python3/0017-setup.py-do-not-report-missing-dependencies-for-disa.patch @@ -1,4 +1,4 @@ -From e3b59cb9658e1d3efa3535840939a0fa92a70a5a Mon Sep 17 00:00:00 2001 +From a2dd127b4163aff6cc35af0d0251321964232ad4 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Mon, 7 Oct 2019 13:22:14 +0200 Subject: [PATCH] setup.py: do not report missing dependencies for disabled @@ -10,22 +10,23 @@ build completeness checker which relies on the report. Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> + --- setup.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/setup.py b/setup.py -index 4b53668..0097643 100644 +index 7691258..ec3f2a4 100644 --- a/setup.py +++ b/setup.py -@@ -365,6 +365,10 @@ class PyBuildExt(build_ext): +@@ -408,6 +408,10 @@ class PyBuildExt(build_ext): print("%-*s %-*s %-*s" % (longest, e, longest, f, longest, g)) + # There is no need to report missing module dependencies, + # if the modules have been disabled in the first place. -+ missing = list(set(missing) - set(sysconf_dis)) ++ self.missing = list(set(self.missing) - set(sysconf_dis)) + - if missing: + if self.missing: print() print("Python build finished successfully!") diff --git a/poky/meta/recipes-devtools/python/python3/0020-configure.ac-setup.py-do-not-add-a-curses-include-pa.patch b/poky/meta/recipes-devtools/python/python3/0020-configure.ac-setup.py-do-not-add-a-curses-include-pa.patch new file mode 100644 index 0000000000..e04a91605c --- /dev/null +++ b/poky/meta/recipes-devtools/python/python3/0020-configure.ac-setup.py-do-not-add-a-curses-include-pa.patch @@ -0,0 +1,48 @@ +From 863c09f640a5dfd33ff22915b0d5fee7bc5df70a Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Sun, 16 Feb 2020 17:50:25 +0100 +Subject: [PATCH] configure.ac, setup.py: do not add a curses include path from + the host + +This leads to host contamination, and particularly can cause +curses modules to fail at runtime if the host curses is configured +differently to native curses (observed on current OpenSuse Tumbleweed +as dnf failures). + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + configure.ac | 6 ------ + setup.py | 2 -- + 2 files changed, 8 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 915f475..c911011 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -4828,12 +4828,6 @@ then + [Define if you have struct stat.st_mtimensec]) + fi + +-# first curses header check +-ac_save_cppflags="$CPPFLAGS" +-if test "$cross_compiling" = no; then +- CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw" +-fi +- + AC_CHECK_HEADERS(curses.h ncurses.h) + + # On Solaris, term.h requires curses.h +diff --git a/setup.py b/setup.py +index b0f1541..7208cd0 100644 +--- a/setup.py ++++ b/setup.py +@@ -973,8 +973,6 @@ class PyBuildExt(build_ext): + panel_library = 'panel' + if curses_library == 'ncursesw': + curses_defines.append(('HAVE_NCURSESW', '1')) +- if not CROSS_COMPILING: +- curses_includes.append('/usr/include/ncursesw') + # Bug 1464056: If _curses.so links with ncursesw, + # _curses_panel.so must link with panelw. + panel_library = 'panelw' diff --git a/poky/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch b/poky/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch index d49604ba4d..61ac3e71dc 100644 --- a/poky/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch +++ b/poky/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch @@ -1,4 +1,4 @@ -From a274ba778838824efcacaba57c415b7262f779ec Mon Sep 17 00:00:00 2001 +From 251347fc970a397a9cd63ed3f87c5e6c52e15187 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Tue, 14 May 2013 15:00:26 -0700 Subject: [PATCH] python3: Add target and native recipes @@ -18,10 +18,10 @@ Upstream-Status: Inappropriate [embedded specific] 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py -index 3dfd0a3..6c6b09a 100644 +index 2df348c..4f8db84 100644 --- a/Lib/distutils/sysconfig.py +++ b/Lib/distutils/sysconfig.py -@@ -97,7 +97,9 @@ def get_python_inc(plat_specific=0, prefix=None): +@@ -96,7 +96,9 @@ def get_python_inc(plat_specific=0, prefix=None): If 'prefix' is supplied, use it instead of sys.base_prefix or sys.base_exec_prefix -- i.e., ignore 'plat_specific'. """ @@ -32,7 +32,7 @@ index 3dfd0a3..6c6b09a 100644 prefix = plat_specific and BASE_EXEC_PREFIX or BASE_PREFIX if os.name == "posix": if python_build: -@@ -140,7 +142,13 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None): +@@ -139,7 +141,13 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None): If 'prefix' is supplied, use it instead of sys.base_prefix or sys.base_exec_prefix -- i.e., ignore 'plat_specific'. """ @@ -47,7 +47,7 @@ index 3dfd0a3..6c6b09a 100644 if standard_lib: prefix = plat_specific and BASE_EXEC_PREFIX or BASE_PREFIX else: -@@ -148,7 +156,7 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None): +@@ -147,7 +155,7 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None): if os.name == "posix": libpython = os.path.join(prefix, diff --git a/poky/meta/recipes-devtools/python/python3/avoid_warning_about_tkinter.patch b/poky/meta/recipes-devtools/python/python3/avoid_warning_about_tkinter.patch index 24e67b4ca1..184540e794 100644 --- a/poky/meta/recipes-devtools/python/python3/avoid_warning_about_tkinter.patch +++ b/poky/meta/recipes-devtools/python/python3/avoid_warning_about_tkinter.patch @@ -1,4 +1,4 @@ -From fead48c8b501a8d7c3db21df2e599f90f38f11d3 Mon Sep 17 00:00:00 2001 +From ba7202700578d435b07cfdfb7b57e83185752800 Mon Sep 17 00:00:00 2001 From: Andrei Gherzan <andrei@gherzan.ro> Date: Mon, 28 Jan 2019 15:57:54 +0000 Subject: [PATCH] _tkinter module needs tk module along with tcl. tk is not yet @@ -11,26 +11,21 @@ Also simply disable the tk module since its not in DEPENDS. Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> --- - setup.py | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) + setup.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py -index fbec00d..b7a36a6 100644 +index ab18ff0..7691258 100644 --- a/setup.py +++ b/setup.py -@@ -1623,10 +1623,12 @@ class PyBuildExt(build_ext): - self.extensions.extend(exts) +@@ -1706,8 +1706,8 @@ class PyBuildExt(build_ext): + self.detect_decimal() + self.detect_ctypes() + self.detect_multiprocessing() +- if not self.detect_tkinter(): +- self.missing.append('_tkinter') ++# if not self.detect_tkinter(): ++# self.missing.append('_tkinter') + self.detect_uuid() - # Call the method for detecting whether _tkinter can be compiled -- self.detect_tkinter(inc_dirs, lib_dirs) -+ # self.detect_tkinter(inc_dirs, lib_dirs) - -- if '_tkinter' not in [e.name for e in self.extensions]: -- missing.append('_tkinter') -+ # tkinter module will not be avalaible as yocto -+ # doesn't have tk integrated (yet) -+ #if '_tkinter' not in [e.name for e in self.extensions]: -+ # missing.append('_tkinter') - - # Build the _uuid module if possible - uuid_incs = find_file("uuid.h", inc_dirs, ["/usr/include/uuid"]) + ## # Uncomment these lines if you want to play with xxmodule.c diff --git a/poky/meta/recipes-devtools/python/python3/python-config.patch b/poky/meta/recipes-devtools/python/python3/python-config.patch index f23b8b7df0..c8a8f3d4aa 100644 --- a/poky/meta/recipes-devtools/python/python3/python-config.patch +++ b/poky/meta/recipes-devtools/python/python3/python-config.patch @@ -1,4 +1,7 @@ -python-config: Revert to using distutils.sysconfig +From 07df0ae0d70cba6d1847fe1c24a71063930bec60 Mon Sep 17 00:00:00 2001 +From: Tyler Hall <tylerwhall@gmail.com> +Date: Sun, 4 May 2014 20:06:43 -0400 +Subject: [PATCH] python-config: Revert to using distutils.sysconfig The newer sysconfig module shares some code with distutils.sysconfig, but the same modifications as in @@ -12,11 +15,16 @@ Upstream-Status: Inappropriate [Embedded Specific] Signed-off-by: Tyler Hall <tylerwhall@gmail.com> : -Index: Python-3.3.3/Misc/python-config.in -=================================================================== ---- Python-3.3.3.orig/Misc/python-config.in -+++ Python-3.3.3/Misc/python-config.in -@@ -4,7 +4,7 @@ + +--- + Misc/python-config.in | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/Misc/python-config.in b/Misc/python-config.in +index 727c4a8..c702829 100644 +--- a/Misc/python-config.in ++++ b/Misc/python-config.in +@@ -6,7 +6,7 @@ import getopt import os import sys @@ -24,8 +32,8 @@ Index: Python-3.3.3/Misc/python-config.in +from distutils import sysconfig valid_opts = ['prefix', 'exec-prefix', 'includes', 'libs', 'cflags', - 'ldflags', 'extension-suffix', 'help', 'abiflags', 'configdir'] -@@ -32,14 +32,14 @@ if '--help' in opt_flags: + 'ldflags', 'extension-suffix', 'help', 'abiflags', 'configdir', +@@ -35,14 +35,14 @@ if '--help' in opt_flags: for opt in opt_flags: if opt == '--prefix': diff --git a/poky/meta/recipes-devtools/python/python3/python3-manifest.json b/poky/meta/recipes-devtools/python/python3/python3-manifest.json index dba92b0e39..3bcc9b8662 100644 --- a/poky/meta/recipes-devtools/python/python3/python3-manifest.json +++ b/poky/meta/recipes-devtools/python/python3/python3-manifest.json @@ -122,7 +122,8 @@ "logging", "netclient", "numbers", - "stringold" + "stringold", + "typing" ], "files": [ "${libdir}/python${PYTHON_MAJMIN}/asyncio", @@ -182,26 +183,15 @@ "compression": { "summary": "Python high-level compression support", "rdepends": [ - "core", - "shell", - "unixadmin" + "core" ], "files": [ - "${libdir}/python${PYTHON_MAJMIN}/_compression.py", - "${libdir}/python${PYTHON_MAJMIN}/bz2.py", "${libdir}/python${PYTHON_MAJMIN}/gzip.py", - "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_bz2.*.so", - "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_lzma.*.so", - "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/zlib.*.so", - "${libdir}/python${PYTHON_MAJMIN}/lzma.py", "${libdir}/python${PYTHON_MAJMIN}/tarfile.py", "${libdir}/python${PYTHON_MAJMIN}/zipfile.py" ], "cached": [ - "${libdir}/python${PYTHON_MAJMIN}/__pycache__/_compression.*.pyc", - "${libdir}/python${PYTHON_MAJMIN}/__pycache__/bz2.*.pyc", "${libdir}/python${PYTHON_MAJMIN}/__pycache__/gzip.*.pyc", - "${libdir}/python${PYTHON_MAJMIN}/__pycache__/lzma.*.pyc", "${libdir}/python${PYTHON_MAJMIN}/__pycache__/tarfile.*.pyc", "${libdir}/python${PYTHON_MAJMIN}/__pycache__/zipfile.*.pyc" ] @@ -210,12 +200,10 @@ "summary": "Python interpreter and core modules", "rdepends": [], "files": [ - "${bindir}/python3", "${bindir}/python${PYTHON_MAJMIN}", "${bindir}/python${PYTHON_MAJMIN}.real", - "${bindir}/python${PYTHON_BINABI}", - "${includedir}/python${PYTHON_BINABI}/pyconfig*.h", - "${prefix}/lib/python${PYTHON_MAJMIN}/config*/*[!.a]", + "${bindir}/python3", + "${includedir}/python${PYTHON_MAJMIN}/pyconfig*.h", "${libdir}/python${PYTHON_MAJMIN}/UserDict.py", "${libdir}/python${PYTHON_MAJMIN}/UserList.py", "${libdir}/python${PYTHON_MAJMIN}/UserString.py", @@ -223,6 +211,7 @@ "${libdir}/python${PYTHON_MAJMIN}/_abcoll.py", "${libdir}/python${PYTHON_MAJMIN}/_bootlocale.py", "${libdir}/python${PYTHON_MAJMIN}/_collections_abc.py", + "${libdir}/python${PYTHON_MAJMIN}/_compression.py", "${libdir}/python${PYTHON_MAJMIN}/_markupbase.py", "${libdir}/python${PYTHON_MAJMIN}/_sitebuiltins.py", "${libdir}/python${PYTHON_MAJMIN}/_sysconfigdata*.py", @@ -231,6 +220,7 @@ "${libdir}/python${PYTHON_MAJMIN}/argparse.py", "${libdir}/python${PYTHON_MAJMIN}/ast.py", "${libdir}/python${PYTHON_MAJMIN}/bisect.py", + "${libdir}/python${PYTHON_MAJMIN}/bz2.py", "${libdir}/python${PYTHON_MAJMIN}/code.py", "${libdir}/python${PYTHON_MAJMIN}/codecs.py", "${libdir}/python${PYTHON_MAJMIN}/codeop.py", @@ -247,6 +237,7 @@ "${libdir}/python${PYTHON_MAJMIN}/encodings/latin_1.py", "${libdir}/python${PYTHON_MAJMIN}/encodings/utf_8.py", "${libdir}/python${PYTHON_MAJMIN}/enum.py", + "${libdir}/python${PYTHON_MAJMIN}/fnmatch.py", "${libdir}/python${PYTHON_MAJMIN}/functools.py", "${libdir}/python${PYTHON_MAJMIN}/genericpath.py", "${libdir}/python${PYTHON_MAJMIN}/getopt.py", @@ -267,13 +258,16 @@ "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/__pycache__/time.*.so", "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/__pycache__/xreadlines.*.so", "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_bisect.*.so", + "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_bz2.*.so", "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_csv.*.so", "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_heapq.*.so", + "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_lzma.*.so", "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_opcode.*.so", "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_posixsubprocess.*.so", "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_struct.*.so", "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/array.*.so", "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/binascii.*.so", + "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/grp.*.so", "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/math.*.so", "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/parser.*.so", "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/readline.*.so", @@ -281,14 +275,18 @@ "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/time.*.so", "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/unicodedata.*.so", "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/xreadlines.*.so", + "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/zlib.*.so", "${libdir}/python${PYTHON_MAJMIN}/linecache.py", "${libdir}/python${PYTHON_MAJMIN}/locale.py", + "${libdir}/python${PYTHON_MAJMIN}/lzma.py", "${libdir}/python${PYTHON_MAJMIN}/new.py", "${libdir}/python${PYTHON_MAJMIN}/ntpath.py", "${libdir}/python${PYTHON_MAJMIN}/opcode.py", "${libdir}/python${PYTHON_MAJMIN}/operator.py", "${libdir}/python${PYTHON_MAJMIN}/optparse.py", "${libdir}/python${PYTHON_MAJMIN}/os.py", + "${libdir}/python${PYTHON_MAJMIN}/pathlib.py", + "${libdir}/python${PYTHON_MAJMIN}/pkgutil.py", "${libdir}/python${PYTHON_MAJMIN}/platform.py", "${libdir}/python${PYTHON_MAJMIN}/posixpath.py", "${libdir}/python${PYTHON_MAJMIN}/re.py", @@ -296,6 +294,7 @@ "${libdir}/python${PYTHON_MAJMIN}/rlcompleter.py", "${libdir}/python${PYTHON_MAJMIN}/runpy.py", "${libdir}/python${PYTHON_MAJMIN}/selectors.py", + "${libdir}/python${PYTHON_MAJMIN}/shutil.py", "${libdir}/python${PYTHON_MAJMIN}/signal.py", "${libdir}/python${PYTHON_MAJMIN}/site.py", "${libdir}/python${PYTHON_MAJMIN}/sitecustomize.py", @@ -315,12 +314,14 @@ "${libdir}/python${PYTHON_MAJMIN}/traceback.py", "${libdir}/python${PYTHON_MAJMIN}/types.py", "${libdir}/python${PYTHON_MAJMIN}/warnings.py", - "${libdir}/python${PYTHON_MAJMIN}/weakref.py" + "${libdir}/python${PYTHON_MAJMIN}/weakref.py", + "${prefix}/lib/python${PYTHON_MAJMIN}/config*/*[!.a]" ], "cached": [ "${libdir}/python${PYTHON_MAJMIN}/__pycache__/__future__.*.pyc", "${libdir}/python${PYTHON_MAJMIN}/__pycache__/_bootlocale.*.pyc", "${libdir}/python${PYTHON_MAJMIN}/__pycache__/_collections_abc.*.pyc", + "${libdir}/python${PYTHON_MAJMIN}/__pycache__/_compression.*.pyc", "${libdir}/python${PYTHON_MAJMIN}/__pycache__/_markupbase.*.pyc", "${libdir}/python${PYTHON_MAJMIN}/__pycache__/_sitebuiltins.*.pyc", "${libdir}/python${PYTHON_MAJMIN}/__pycache__/_sysconfigdata.*.pyc", @@ -329,6 +330,7 @@ "${libdir}/python${PYTHON_MAJMIN}/__pycache__/argparse.*.pyc", "${libdir}/python${PYTHON_MAJMIN}/__pycache__/ast.*.pyc", "${libdir}/python${PYTHON_MAJMIN}/__pycache__/bisect.*.pyc", + "${libdir}/python${PYTHON_MAJMIN}/__pycache__/bz2.*.pyc", "${libdir}/python${PYTHON_MAJMIN}/__pycache__/code.*.pyc", "${libdir}/python${PYTHON_MAJMIN}/__pycache__/codecs.*.pyc", "${libdir}/python${PYTHON_MAJMIN}/__pycache__/codeop.*.pyc", @@ -339,6 +341,7 @@ "${libdir}/python${PYTHON_MAJMIN}/__pycache__/csv.*.pyc", "${libdir}/python${PYTHON_MAJMIN}/__pycache__/dis.*.pyc", "${libdir}/python${PYTHON_MAJMIN}/__pycache__/enum.*.pyc", + "${libdir}/python${PYTHON_MAJMIN}/__pycache__/fnmatch.*.pyc", "${libdir}/python${PYTHON_MAJMIN}/__pycache__/functools.*.pyc", "${libdir}/python${PYTHON_MAJMIN}/__pycache__/genericpath.*.pyc", "${libdir}/python${PYTHON_MAJMIN}/__pycache__/getopt.*.pyc", @@ -350,10 +353,14 @@ "${libdir}/python${PYTHON_MAJMIN}/__pycache__/keyword.*.pyc", "${libdir}/python${PYTHON_MAJMIN}/__pycache__/linecache.*.pyc", "${libdir}/python${PYTHON_MAJMIN}/__pycache__/locale.*.pyc", + "${libdir}/python${PYTHON_MAJMIN}/__pycache__/lzma.*.pyc", + "${libdir}/python${PYTHON_MAJMIN}/__pycache__/ntpath.*.pyc", "${libdir}/python${PYTHON_MAJMIN}/__pycache__/opcode.*.pyc", "${libdir}/python${PYTHON_MAJMIN}/__pycache__/operator.*.pyc", "${libdir}/python${PYTHON_MAJMIN}/__pycache__/optparse.*.pyc", "${libdir}/python${PYTHON_MAJMIN}/__pycache__/os.*.pyc", + "${libdir}/python${PYTHON_MAJMIN}/__pycache__/pathlib.*.pyc", + "${libdir}/python${PYTHON_MAJMIN}/__pycache__/pkgutil.*.pyc", "${libdir}/python${PYTHON_MAJMIN}/__pycache__/platform.*.pyc", "${libdir}/python${PYTHON_MAJMIN}/__pycache__/posixpath.*.pyc", "${libdir}/python${PYTHON_MAJMIN}/__pycache__/re.*.pyc", @@ -361,6 +368,7 @@ "${libdir}/python${PYTHON_MAJMIN}/__pycache__/rlcompleter.*.pyc", "${libdir}/python${PYTHON_MAJMIN}/__pycache__/runpy.*.pyc", "${libdir}/python${PYTHON_MAJMIN}/__pycache__/selectors.*.pyc", + "${libdir}/python${PYTHON_MAJMIN}/__pycache__/shutil.*.pyc", "${libdir}/python${PYTHON_MAJMIN}/__pycache__/signal.*.pyc", "${libdir}/python${PYTHON_MAJMIN}/__pycache__/site.*.pyc", "${libdir}/python${PYTHON_MAJMIN}/__pycache__/sre_compile.*.pyc", @@ -405,10 +413,10 @@ "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_blake2.*.so", "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_crypt.*.so", "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_hashlib.*.so", + "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_md5.*.so", + "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_sha1.*.so", "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_sha256.*.so", "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_sha3.*.so", - "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_sha1.*.so", - "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_md5.*.so", "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_sha512.*.so" ], "cached": [ @@ -519,14 +527,12 @@ ] }, "distutils-windows": { - "cached": [], - "files": [ - "${libdir}/python${PYTHON_MAJMIN}/distutils/command/wininst-*.exe" - ], + "summary": "Python distribution utilities (Windows installer stubs)", "rdepends": [ - "distutils" + "core" ], - "summary": "Python distribution utilities (Windows installer stubs)" + "files": [], + "cached": [] }, "distutils": { "summary": "Python Distribution Utilities", @@ -541,13 +547,19 @@ "doctest": { "summary": "Python framework for running examples in docstrings", "rdepends": [ + "asyncio", + "compression", "core", "debugger", "difflib", + "io", "logging", + "netclient", + "numbers", "pprint", "shell", "stringold", + "typing", "unittest" ], "files": [ @@ -641,8 +653,7 @@ "crypt", "math", "netclient", - "shell", - "unixadmin" + "shell" ], "files": [ "${libdir}/python${PYTHON_MAJMIN}/_pyio.py", @@ -875,9 +886,7 @@ "math", "mime", "netclient", - "shell", - "stringold", - "unixadmin" + "stringold" ], "files": [ "${libdir}/python${PYTHON_MAJMIN}/cgi.py", @@ -934,12 +943,8 @@ "rdepends": [ "core" ], - "files": [ - "${libdir}/python${PYTHON_MAJMIN}/pkgutil.py" - ], - "cached": [ - "${libdir}/python${PYTHON_MAJMIN}/__pycache__/pkgutil.*.pyc" - ] + "files": [], + "cached": [] }, "plistlib": { "summary": "Generate and parse Mac OS X .plist files", @@ -988,8 +993,7 @@ "summary": "Python interactive help support", "rdepends": [ "core", - "netclient", - "pkgutil" + "netclient" ], "files": [ "${bindir}/pydoc*", @@ -1015,22 +1019,17 @@ "rdepends": [ "compression", "core", - "stringold", - "unixadmin" + "stringold" ], "files": [ "${libdir}/python${PYTHON_MAJMIN}/cmd.py", - "${libdir}/python${PYTHON_MAJMIN}/fnmatch.py", "${libdir}/python${PYTHON_MAJMIN}/glob.py", - "${libdir}/python${PYTHON_MAJMIN}/shlex.py", - "${libdir}/python${PYTHON_MAJMIN}/shutil.py" + "${libdir}/python${PYTHON_MAJMIN}/shlex.py" ], "cached": [ "${libdir}/python${PYTHON_MAJMIN}/__pycache__/cmd.*.pyc", - "${libdir}/python${PYTHON_MAJMIN}/__pycache__/fnmatch.*.pyc", "${libdir}/python${PYTHON_MAJMIN}/__pycache__/glob.*.pyc", - "${libdir}/python${PYTHON_MAJMIN}/__pycache__/shlex.*.pyc", - "${libdir}/python${PYTHON_MAJMIN}/__pycache__/shutil.*.pyc" + "${libdir}/python${PYTHON_MAJMIN}/__pycache__/shlex.*.pyc" ] }, "smtpd": { @@ -1150,12 +1149,17 @@ "unittest": { "summary": "Python unit testing framework", "rdepends": [ + "asyncio", + "compression", "core", "difflib", + "io", "logging", + "netclient", + "numbers", "pprint", - "shell", - "stringold" + "stringold", + "typing" ], "files": [ "${libdir}/python${PYTHON_MAJMIN}/unittest", @@ -1172,7 +1176,6 @@ ], "files": [ "${libdir}/python${PYTHON_MAJMIN}/getpass.py", - "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/grp.*.so", "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/nis.*.so" ], "cached": [ @@ -1185,9 +1188,7 @@ "compression", "core", "logging", - "shell", - "stringold", - "unixadmin" + "stringold" ], "files": [ "${bindir}/pyvenv*", diff --git a/poky/meta/recipes-devtools/python/python3/run-ptest b/poky/meta/recipes-devtools/python/python3/run-ptest index 3e45d3918c..405b07f495 100644 --- a/poky/meta/recipes-devtools/python/python3/run-ptest +++ b/poky/meta/recipes-devtools/python/python3/run-ptest @@ -1,3 +1,3 @@ #!/bin/sh -python3 -m test -v | sed -u -e '/\.\.\. ok/ s/^/PASS: /g' -e '/\.\.\. [ERROR|FAIL]/ s/^/FAIL: /g' -e '/\.\.\. skipped/ s/^/SKIP: /g' -e 's/ \.\.\. ok//g' -e 's/ \.\.\. ERROR//g' -e 's/ \.\.\. FAIL//g' -e 's/ \.\.\. skipped//g' +python3 -m test -v | sed -u -e '/\.\.\. ok/ s/^/PASS: /g' -r -e '/\.\.\. (ERROR|FAIL)/ s/^/FAIL: /g' -e '/\.\.\. skipped/ s/^/SKIP: /g' -e 's/ \.\.\. ok//g' -e 's/ \.\.\. ERROR//g' -e 's/ \.\.\. FAIL//g' -e 's/ \.\.\. skipped//g' |