python3: upgrade to 3.7.2
PATCH 1/3 python3: upgrade to 3.7.2
I took the same approach as the recent perl upgrade: write recipe from scratch, taking the pieces from the old recipe only when they were proven to be necessary.
The pgo, manifest and ptest features are all preserved.
New features:
- native and target recipes are now unified into one recipe
- check_build_completeness.py runs right after do_compile() and verifies that all optional modules have been built (a notorious source of regressions)
- a new approach to sysconfig.py and distutils/sysconfig.py returning values appropriate for native or target builds: we copy the configuration file to a separate folder, add that folder to sys.path (through environment variable that differs between native and target builds), and point python to the file through another environment variable.
--- meta/classes/python3-dir.bbclass | 2 +- meta/classes/python3native.bbclass | 2 + ...ib-termcap-to-linker-flags-to-avoid-.patch | 25 + ...ode-usr-lib-as-destination-directory.patch | 41 + ...hell-version-of-python-config-that-w.patch | 35 + ...-qemu-wrapper-when-gathering-profile.patch | 25 + ...fig-append-STAGING_LIBDIR-python-sys.patch | 42 + ...tutils-prefix-is-inside-staging-area.patch | 54 + .../python3/avoid_warning_about_tkinter.patch | 36 + .../python-sanity/python3/cgi_py.patch | 32 + .../python3/check_build_completeness.py | 17 + .../python-sanity/python3/create_manifest3.py | 433 ++++++ .../python-sanity/python3/get_module_deps3.py | 146 ++ .../python-sanity/python3/python-config.patch | 46 + .../python3/python3-manifest.json | 1227 +++++++++++++++++ .../python-sanity/python3/run-ptest | 3 + .../python-sanity/python3_3.7.2.bb | 283 ++++ 17 files changed, 2448 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-devtools/python-sanity/python3/0001-Do-not-add-usr-lib-termcap-to-linker-flags-to-avoid-.patch create mode 100644 meta/recipes-devtools/python-sanity/python3/0001-Do-not-hardcode-usr-lib-as-destination-directory.patch create mode 100644 meta/recipes-devtools/python-sanity/python3/0001-Do-not-use-the-shell-version-of-python-config-that-w.patch create mode 100644 meta/recipes-devtools/python-sanity/python3/0001-Makefile.pre-use-qemu-wrapper-when-gathering-profile.patch create mode 100644 meta/recipes-devtools/python-sanity/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch create mode 100644 meta/recipes-devtools/python-sanity/python3/12-distutils-prefix-is-inside-staging-area.patch create mode 100644 meta/recipes-devtools/python-sanity/python3/avoid_warning_about_tkinter.patch create mode 100644 meta/recipes-devtools/python-sanity/python3/cgi_py.patch create mode 100755 meta/recipes-devtools/python-sanity/python3/check_build_completeness.py create mode 100644 meta/recipes-devtools/python-sanity/python3/create_manifest3.py create mode 100644 meta/recipes-devtools/python-sanity/python3/get_module_deps3.py create mode 100644 meta/recipes-devtools/python-sanity/python3/python-config.patch create mode 100644 meta/recipes-devtools/python-sanity/python3/python3-manifest.json create mode 100644 meta/recipes-devtools/python-sanity/python3/run-ptest create mode 100644 meta/recipes-devtools/python-sanity/python3_3.7.2.bb
meta/classes/python3-dir.bbclass +1 -1
@@ -1,4 +1,4 @@ -PYTHON_BASEVERSION = "3.5" +PYTHON_BASEVERSION = "3.7" PYTHON_ABI = "m" PYTHON_DIR = "python${PYTHON_BASEVERSION}" PYTHON_PN = "python3"
meta/classes/python3native.bbclass +2 -0
@@ -9,6 +9,8 @@ DEPENDS_append = " python3-native " export STAGING_INCDIR export STAGING_LIBDIR +export _PYTHON_SYSCONFIGDATA_NAME="_sysconfigdata" + # suppress host user's site-packages dirs. export PYTHONNOUSERSITE = "1"
meta/recipes-devtools/python-sanity/python3/0001-Do-not-add-usr-lib-termcap-to-linker-flags-to-avoid-.patch new file +25 -0
@@ -0,0 +1,25 @@ +From 23294c6ba6896115828293fdb7e67b47b38ba675 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Fri, 25 Jan 2019 19:04:13 +0100 +Subject: [PATCH] Do not add /usr/lib/termcap to linker flags to avoid host + contamination + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Alexander Kanavin <[email protected]> + +--- + setup.py | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/setup.py b/setup.py +index b4357e3..fbec00d 100644 +--- a/setup.py ++++ b/setup.py +@@ -856,7 +856,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) ) + else:
meta/recipes-devtools/python-sanity/python3/0001-Do-not-hardcode-usr-lib-as-destination-directory.patch new file +41 -0
41 lines not on this page · raw message
meta/recipes-devtools/python-sanity/python3/0001-Do-not-use-the-shell-version-of-python-config-that-w.patch new file +35 -0
@@ -0,0 +1,35 @@ +From 148861fa16f2aaacd518770f337ea54b5182f981 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Tue, 29 Jan 2019 15:03:01 +0100 +Subject: [PATCH] Do not use the shell version of python-config that was + introduced in 3.4 + +Revert instead to the original python version: it has our tweaks and +outputs directories correctly. + +Upstream-Status: Inappropriate [oe-specific] +Signed-off-by: Alexander Kanavin <[email protected]> +--- + Makefile.pre.in | 9 +++------ + 1 file changed, 3 insertions(+), 6 deletions(-) + +diff --git a/Makefile.pre.in b/Makefile.pre.in +index 2d2e11f..cc19942 100644 +--- a/Makefile.pre.in ++++ b/Makefile.pre.in +@@ -1431,12 +1431,9 @@ python-config: $(srcdir)/Misc/python-config.in Misc/python-config.sh + sed -e "s,@EXENAME@,$(BINDIR)/python$(LDVERSION)$(EXE)," < $(srcdir)/Misc/python-config.in >python-config.py + @ # Replace makefile compat. variable references with shell script compat. ones; $(VAR) -> ${VAR} + LC_ALL=C sed -e 's,\$$(\([A-Za-z0-9_]*\)),\$$\{\1\},g' < Misc/python-config.sh >python-config +- @ # On Darwin, always use the python version of the script, the shell +- @ # version doesn't use the compiler customizations that are provided +- @ # in python (_osx_support.py). +- @if test `uname -s` = Darwin; then \ +- cp python-config.py python-config; \ +- fi ++ @ # In OpenEmbedded, always use the python version of the script, the shell ++ @ # version is broken in multiple ways, and doesn't return correct directories ++ cp python-config.py python-config + + + # Install the include files
meta/recipes-devtools/python-sanity/python3/0001-Makefile.pre-use-qemu-wrapper-when-gathering-profile.patch new file +25 -0
@@ -0,0 +1,25 @@ +From cf6a9100902484e4d028ee88742dd2487b014a98 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Wed, 30 Jan 2019 12:41:04 +0100 +Subject: [PATCH] Makefile.pre: use qemu wrapper when gathering profile data + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Alexander Kanavin <[email protected]> +--- + Makefile.pre.in | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/Makefile.pre.in b/Makefile.pre.in +index a3a02a7..d5503dd 100644 +--- a/Makefile.pre.in ++++ b/Makefile.pre.in +@@ -507,8 +507,7 @@ build_all_generate_profile: + $(MAKE) @DEF_MAKE_RULE@ CFLAGS_NODIST="$(CFLAGS_NODIST) $(PGO_PROF_GEN_FLAG)" LDFLAGS_NODIST="$(LDFLAGS_NODIST) $(PGO_PROF_GEN_FLAG)" LIBS="$(LIBS)" + + run_profile_task: +- @ # FIXME: can't run for a cross build +- $(LLVM_PROF_FILE) $(RUNSHARED) ./$(BUILDPYTHON) $(PROFILE_TASK) || true ++ ./pgo-wrapper ./python -m test.regrtest --pgo test_grammar test_opcodes test_dict test_builtin test_exceptions test_types test_support || true + + build_all_merge_profile: + $(LLVM_PROF_MERGER)
meta/recipes-devtools/python-sanity/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch new file +42 -0
42 lines not on this page · raw message
meta/recipes-devtools/python-sanity/python3/12-distutils-prefix-is-inside-staging-area.patch new file +54 -0
54 lines not on this page · raw message
meta/recipes-devtools/python-sanity/python3/avoid_warning_about_tkinter.patch new file +36 -0
@@ -0,0 +1,36 @@ +From fead48c8b501a8d7c3db21df2e599f90f38f11d3 Mon Sep 17 00:00:00 2001 +From: Andrei Gherzan <[email protected]> +Date: Mon, 28 Jan 2019 15:57:54 +0000 +Subject: [PATCH] _tkinter module needs tk module along with tcl. tk is not yet + integrated in yocto so we skip the check for this module. Avoid a warning by + not adding this module to missing variable. + +Upstream-Status: Inappropriate [distribution] + +Also simply disable the tk module since its not in DEPENDS. +Signed-off-by: Andrei Gherzan <[email protected]> + +--- + setup.py | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/setup.py b/setup.py +index fbec00d..b7a36a6 100644 +--- a/setup.py ++++ b/setup.py +@@ -1623,10 +1623,12 @@ class PyBuildExt(build_ext): + self.extensions.extend(exts) + + # 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"])
meta/recipes-devtools/python-sanity/python3/cgi_py.patch new file +32 -0
@@ -0,0 +1,32 @@ +From 62336285cba38017b35cb761c03f0c7e80a671a3 Mon Sep 17 00:00:00 2001 +From: Mark Hatle <[email protected]> +Date: Wed, 21 Sep 2011 20:55:33 -0500 +Subject: [PATCH] Lib/cgi.py: Update the script as mentioned in the comment + +Upstream-Status: Inappropriate [distribution] + +Signed-off-by: Mark Hatle <[email protected]> + +--- + Lib/cgi.py | 11 +---------- + 1 file changed, 1 insertion(+), 10 deletions(-) + +diff --git a/Lib/cgi.py b/Lib/cgi.py +index 8cf6687..094c7b4 100755 +--- a/Lib/cgi.py ++++ b/Lib/cgi.py +@@ -1,13 +1,4 @@ +-#! /usr/local/bin/python +- +-# NOTE: the above "/usr/local/bin/python" is NOT a mistake. It is +-# intentionally NOT "/usr/bin/env python". On many systems +-# (e.g. Solaris), /usr/local/bin is not in $PATH as passed to CGI +-# scripts, and /usr/local/bin is the default directory where Python is +-# installed, so /usr/bin/env would be unable to find python. Granted, +-# binary installations by Linux vendors often install Python in +-# /usr/bin. So let those vendors patch cgi.py to match their choice +-# of installation. ++#! /usr/bin/env python + + """Support module for CGI (Common Gateway Interface) scripts. +
meta/recipes-devtools/python-sanity/python3/check_build_completeness.py new file +17 -0
@@ -0,0 +1,17 @@ +#!/usr/bin/env python3 +import sys +logfile = open(sys.argv[1]).read() + +necessary_bits = logfile.find("The necessary bits to build these optional modules were not found") +to_find_bits = logfile.find("To find the necessary bits, look in setup.py in detect_modules() for the module's name.") +if necessary_bits != -1: + print("%s" %(logfile[necessary_bits:to_find_bits])) + +failed_to_build = logfile.find("Failed to build these modules:") +if failed_to_build != -1: + failed_to_build_end = logfile.find("\n\n", failed_to_build) + print("%s" %(logfile[failed_to_build:failed_to_build_end])) + +if necessary_bits != -1 or failed_to_build != -1: + sys.exit(1) +
meta/recipes-devtools/python-sanity/python3/create_manifest3.py new file +433 -0
433 lines not on this page · raw message
meta/recipes-devtools/python-sanity/python3/get_module_deps3.py new file +146 -0
146 lines not on this page · raw message
meta/recipes-devtools/python-sanity/python3/python-config.patch new file +46 -0
46 lines not on this page · raw message
meta/recipes-devtools/python-sanity/python3/python3-manifest.json new file +1227 -0
1,227 lines not on this page · raw message
meta/recipes-devtools/python-sanity/python3/run-ptest new file +3 -0
@@ -0,0 +1,3 @@ +#!/bin/sh + +python3 -m test -v | sed -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'
meta/recipes-devtools/python-sanity/python3_3.7.2.bb new file +283 -0
283 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH 2/3 python3: delete old 3.5.6 version
--- .../python/python3-native_3.5.6.bb | 104 -- meta/recipes-devtools/python/python3.inc | 43 - ...hell-version-of-python-config-that-w.patch | 38 - ..._sysconfigdata.py-to-initialize-dist.patch | 66 - ...ontext-has-improved-default-settings.patch | 272 ---- ...3032-where-it-fails-with-UnicodeDeco.patch | 37 - ...asename-to-replace-CC-for-checking-c.patch | 140 -- ...d-target-to-split-profile-generation.patch | 40 - ...S-1.3-cipher-suites-and-OP_NO_TLSv1_.patch | 227 --- ...for-TLS-1.3-and-OpenSSL-1.1.1-GH-876.patch | 173 --- ....3-ciphers-for-OpenSSL-1.1.1-GH-6976.patch | 110 -- ...ALPN-changes-for-OpenSSL-1.1.0f-2305.patch | 68 - .../python3/03-fix-tkinter-detection.patch | 42 - .../python3/030-fixup-include-dirs.patch | 33 - .../080-distutils-dont_adjust_files.patch | 92 -- ...tutils-prefix-is-inside-staging-area.patch | 57 - .../python/python3/130-readline-setup.patch | 55 - .../python/python3/150-fix-setupterm.patch | 17 - ...GS-for-extensions-when-cross-compili.patch | 56 - .../python3/avoid-ncursesw-include-path.patch | 21 - .../python3/avoid_warning_about_tkinter.patch | 29 - .../python/python3/cgi_py.patch | 23 - .../python3/configure.ac-fix-LIBPL.patch | 30 - .../python/python3/create_manifest3.py | 433 ------ .../fix_for_using_different_libdir.patch | 54 - .../python/python3/float-endian.patch | 212 --- .../python/python3/ftplib.patch | 60 - .../python/python3/get_module_deps3.py | 146 -- .../python3/host_include_contamination.patch | 28 - ...ssing-libraries-to-Extension-for-mul.patch | 82 -- .../python/python3/python-3.3-multilib.patch | 363 ----- .../python/python3/python-config.patch | 46 - .../python/python3/python3-manifest.json | 1242 ----------------- ...CROSSPYTHONPATH-for-PYTHON_FOR_BUILD.patch | 25 - .../python/python3/regen-all.patch | 25 - .../recipes-devtools/python/python3/run-ptest | 3 - ...check-cross_compiling-when-get-FLAGS.patch | 50 - .../python/python3/setuptweaks.patch | 57 - .../python/python3/signal.patch | 56 - .../python/python3/sitecustomize.py | 37 - ...port_SOURCE_DATE_EPOCH_in_py_compile.patch | 97 -- ...sysconfig.py-add-_PYTHON_PROJECT_SRC.patch | 51 - .../python3/sysroot-include-headers.patch | 35 - ...k-MULTIARCH-for-powerpc-linux-gnuspe.patch | 52 - ...eak-MULTIARCH-for-powerpc-linux-musl.patch | 40 - .../python/python3/unixccompiler.patch | 35 - meta/recipes-devtools/python/python3_3.5.6.bb | 334 ----- 47 files changed, 5336 deletions(-) delete mode 100644 meta/recipes-devtools/python/python3-native_3.5.6.bb delete mode 100644 meta/recipes-devtools/python/python3.inc delete mode 100644 meta/recipes-devtools/python/python3/0001-Do-not-use-the-shell-version-of-python-config-that-w.patch delete mode 100644 meta/recipes-devtools/python/python3/0001-Issue-21272-Use-_sysconfigdata.py-to-initialize-dist.patch delete mode 100644 meta/recipes-devtools/python/python3/0001-Issue-28043-SSLContext-has-improved-default-settings.patch delete mode 100644 meta/recipes-devtools/python/python3/0001-h2py-Fix-issue-13032-where-it-fails-with-UnicodeDeco.patch delete mode 100644 meta/recipes-devtools/python/python3/0001-python3-use-cc_basename-to-replace-CC-for-checking-c.patch delete mode 100644 meta/recipes-devtools/python/python3/0002-Makefile-add-target-to-split-profile-generation.patch delete mode 100644 meta/recipes-devtools/python/python3/0002-bpo-29136-Add-TLS-1.3-cipher-suites-and-OP_NO_TLSv1_.patch delete mode 100644 meta/recipes-devtools/python/python3/0003-bpo-32947-Fixes-for-TLS-1.3-and-OpenSSL-1.1.1-GH-876.patch delete mode 100644 meta/recipes-devtools/python/python3/0004-bpo-33570-TLS-1.3-ciphers-for-OpenSSL-1.1.1-GH-6976.patch delete mode 100644 meta/recipes-devtools/python/python3/0005-bpo-30714-ALPN-changes-for-OpenSSL-1.1.0f-2305.patch delete mode 100644 meta/recipes-devtools/python/python3/03-fix-tkinter-detection.patch delete mode 100644 meta/recipes-devtools/python/python3/030-fixup-include-dirs.patch delete mode 100644 meta/recipes-devtools/python/python3/080-distutils-dont_adjust_files.patch delete mode 100644 meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch delete mode 100644 meta/recipes-devtools/python/python3/130-readline-setup.patch delete mode 100644 meta/recipes-devtools/python/python3/150-fix-setupterm.patch delete mode 100644 meta/recipes-devtools/python/python3/Use-correct-CFLAGS-for-extensions-when-cross-compili.patch delete mode 100644 meta/recipes-devtools/python/python3/avoid-ncursesw-include-path.patch delete mode 100644 meta/recipes-devtools/python/python3/avoid_warning_about_tkinter.patch delete mode 100644 meta/recipes-devtools/python/python3/cgi_py.patch delete mode 100644 meta/recipes-devtools/python/python3/configure.ac-fix-LIBPL.patch delete mode 100644 meta/recipes-devtools/python/python3/create_manifest3.py delete mode 100644 meta/recipes-devtools/python/python3/fix_for_using_different_libdir.patch delete mode 100644 meta/recipes-devtools/python/python3/float-endian.patch delete mode 100644 meta/recipes-devtools/python/python3/ftplib.patch delete mode 100644 meta/recipes-devtools/python/python3/get_module_deps3.py delete mode 100644 meta/recipes-devtools/python/python3/host_include_contamination.patch delete mode 100644 meta/recipes-devtools/python/python3/pass-missing-libraries-to-Extension-for-mul.patch delete mode 100644 meta/recipes-devtools/python/python3/python-3.3-multilib.patch delete mode 100644 meta/recipes-devtools/python/python3/python-config.patch delete mode 100644 meta/recipes-devtools/python/python3/python3-manifest.json delete mode 100644 meta/recipes-devtools/python/python3/python3-use-CROSSPYTHONPATH-for-PYTHON_FOR_BUILD.patch delete mode 100644 meta/recipes-devtools/python/python3/regen-all.patch delete mode 100644 meta/recipes-devtools/python/python3/run-ptest delete mode 100644 meta/recipes-devtools/python/python3/setup.py-check-cross_compiling-when-get-FLAGS.patch delete mode 100644 meta/recipes-devtools/python/python3/setuptweaks.patch delete mode 100644 meta/recipes-devtools/python/python3/signal.patch delete mode 100644 meta/recipes-devtools/python/python3/sitecustomize.py delete mode 100644 meta/recipes-devtools/python/python3/support_SOURCE_DATE_EPOCH_in_py_compile.patch delete mode 100644 meta/recipes-devtools/python/python3/sysconfig.py-add-_PYTHON_PROJECT_SRC.patch delete mode 100644 meta/recipes-devtools/python/python3/sysroot-include-headers.patch delete mode 100644 meta/recipes-devtools/python/python3/tweak-MULTIARCH-for-powerpc-linux-gnuspe.patch delete mode 100644 meta/recipes-devtools/python/python3/tweak-MULTIARCH-for-powerpc-linux-musl.patch delete mode 100644 meta/recipes-devtools/python/python3/unixccompiler.patch delete mode 100644 meta/recipes-devtools/python/python3_3.5.6.bb
meta/recipes-devtools/python/python3-native_3.5.6.bb deleted +0 -104
@@ -1,104 +0,0 @@ -require recipes-devtools/python/python3.inc - -DISTRO_SRC_URI ?= "file://sitecustomize.py" -DISTRO_SRC_URI_linuxstdbase = "" -SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ -file://12-distutils-prefix-is-inside-staging-area.patch \ -file://python-config.patch \ -file://030-fixup-include-dirs.patch \ -file://080-distutils-dont_adjust_files.patch \ -file://130-readline-setup.patch \ -file://150-fix-setupterm.patch \ -file://python-3.3-multilib.patch \ -file://03-fix-tkinter-detection.patch \ -${@bb.utils.contains('PACKAGECONFIG', 'tk', '', 'file://avoid_warning_about_tkinter.patch', d)} \ -file://0001-h2py-Fix-issue-13032-where-it-fails-with-UnicodeDeco.patch \ -file://sysroot-include-headers.patch \ -file://unixccompiler.patch \ -${DISTRO_SRC_URI} \ -file://sysconfig.py-add-_PYTHON_PROJECT_SRC.patch \ -file://setup.py-check-cross_compiling-when-get-FLAGS.patch \ -file://0001-Do-not-use-the-shell-version-of-python-config-that-w.patch \ -file://support_SOURCE_DATE_EPOCH_in_py_compile.patch \ -file://regen-all.patch \ -file://0001-Issue-28043-SSLContext-has-improved-default-settings.patch \ -file://0002-bpo-29136-Add-TLS-1.3-cipher-suites-and-OP_NO_TLSv1_.patch \ -file://0003-bpo-32947-Fixes-for-TLS-1.3-and-OpenSSL-1.1.1-GH-876.patch \ -file://0004-bpo-33570-TLS-1.3-ciphers-for-OpenSSL-1.1.1-GH-6976.patch \ -file://0005-bpo-30714-ALPN-changes-for-OpenSSL-1.1.0f-2305.patch \ -" -PACKAGECONFIG[tk] = ",,tk-native" - -EXTRANATIVEPATH += "bzip2-native" -DEPENDS = "openssl-native bzip2-replacement-native zlib-native readline-native sqlite3-native gdbm-native" - -inherit native - -EXTRA_OECONF_append = " --bindir=${bindir}/${PN} --without-ensurepip" - -EXTRA_OEMAKE = '\ - LIBC="" \ - STAGING_LIBDIR=${STAGING_LIBDIR_NATIVE} \ - STAGING_INCDIR=${STAGING_INCDIR_NATIVE} \ - LIB=${baselib} \ - ARCH=${TARGET_ARCH} \ -' - -do_configure_append() { - autoreconf --verbose --install --force --exclude=autopoint ../Python-${PV}/Modules/_ctypes/libffi - sed -i -e 's,#define HAVE_GETRANDOM 1,/\* #undef HAVE_GETRANDOM \*/,' ${B}/pyconfig.h -} - -# Regenerate all of the generated files -# This ensures that pgen and friends get created during the compile phase -# -do_compile_prepend() { - # Assuming https://bugs.python.org/issue33080 has been addressed in Makefile. - oe_runmake regen-all -} - -do_install() { - install -d ${D}${libdir}/pkgconfig - oe_runmake 'DESTDIR=${D}' install - if [ -e ${WORKDIR}/sitecustomize.py ]; then - install -m 0644 ${WORKDIR}/sitecustomize.py ${D}/${libdir}/python${PYTHON_MAJMIN} - fi - install -d ${D}${bindir}/${PN} - install -m 0755 Parser/pgen ${D}${bindir}/${PN} - - # Make sure we use /usr/bin/env python - for PYTHSCRIPT in `grep -rIl ${bindir}/${PN}/python ${D}${bindir}/${PN}`; do - sed -i -e '1s|^#!.*|#!/usr/bin/env python3|' $PYTHSCRIPT - done - - # Add a symlink to the native Python so that scripts can just invoke - # "nativepython" and get the right one without needing absolute paths - # (these often end up too long for the #! parser in the kernel as the - # buffer is 128 bytes long). - ln -s python3-native/python3 ${D}${bindir}/nativepython3 -} - -python(){ - - # Read JSON manifest - import json - pythondir = d.getVar('THISDIR') - with open(pythondir+'/python3/python3-manifest.json') as manifest_file: - manifest_str = manifest_file.read() - json_start = manifest_str.find('# EOC') + 6 - manifest_file.seek(json_start) - manifest_str = manifest_file.read() - python_manifest = json.loads(manifest_str) - - rprovides = d.getVar('RPROVIDES').split() - - # Hardcoded since it cant be python3-native-foo, should be python3-foo-native - pn = 'python3' - - for key in python_manifest: - pypackage = pn + '-' + key + '-native' - if pypackage not in rprovides: - rprovides.append(pypackage) - - d.setVar('RPROVIDES', ' '.join(rprovides)) -}
meta/recipes-devtools/python/python3.inc deleted +0 -43
43 lines not on this page · raw message
meta/recipes-devtools/python/python3/0001-Do-not-use-the-shell-version-of-python-config-that-w.patch deleted +0 -38
@@ -1,38 +0,0 @@ -From 04df959365e2b54d7503edf0e5534ff094284f2d Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <[email protected]> -Date: Fri, 23 Oct 2015 12:25:09 +0300 -Subject: [PATCH] Do not use the shell version of python-config that was - introduced in 3.4 - -Revert instead to the original python version: it has our tweaks and -outputs directories correctly. - -Upstream-Status: Inappropriate [oe-specific] -Signed-off-by: Alexander Kanavin <[email protected]> ---- - Makefile.pre.in | 9 +++------ - 1 file changed, 3 insertions(+), 6 deletions(-) - -diff --git a/Makefile.pre.in b/Makefile.pre.in -index 236f005..5c4337f 100644 ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -1348,12 +1348,9 @@ python-config: $(srcdir)/Misc/python-config.in Misc/python-config.sh - sed -e "s,@EXENAME@,$(BINDIR)/python$(LDVERSION)$(EXE)," < $(srcdir)/Misc/python-config.in >python-config.py - # Replace makefile compat. variable references with shell script compat. ones; $(VAR) -> ${VAR} - LC_ALL=C sed -e 's,\$$(\([A-Za-z0-9_]*\)),\$$\{\1\},g' < Misc/python-config.sh >python-config -- # On Darwin, always use the python version of the script, the shell -- # version doesn't use the compiler customizations that are provided -- # in python (_osx_support.py). -- if test `uname -s` = Darwin; then \ -- cp python-config.py python-config; \ -- fi -+ # In OpenEmbedded, always use the python version of the script, the shell -+ # version is broken in multiple ways, and doesn't return correct directories -+ cp python-config.py python-config - - - # Install the include files --- -2.11.0 -
meta/recipes-devtools/python/python3/0001-Issue-21272-Use-_sysconfigdata.py-to-initialize-dist.patch deleted +0 -66
66 lines not on this page · raw message
meta/recipes-devtools/python/python3/0001-Issue-28043-SSLContext-has-improved-default-settings.patch deleted +0 -272
272 lines not on this page · raw message
meta/recipes-devtools/python/python3/0001-h2py-Fix-issue-13032-where-it-fails-with-UnicodeDeco.patch deleted +0 -37
@@ -1,37 +0,0 @@ -From 2f5a4c708d90fa8db21f446ae879cff79387448d Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Mon, 20 May 2013 21:03:16 -0700 -Subject: [PATCH] h2py: Fix issue 13032 where it fails with UnicodeDecodeError - -use utf-8 to open the files - -Signed-off-by: Khem Raj <[email protected]> - -Upstream-Status: Pending ---- - Tools/scripts/h2py.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Tools/scripts/h2py.py b/Tools/scripts/h2py.py -index 4f871d9..a53fbe0 100755 ---- a/Tools/scripts/h2py.py -+++ b/Tools/scripts/h2py.py -@@ -69,13 +69,13 @@ def main(): - sys.stdout.write('# Generated by h2py from stdin\n') - process(sys.stdin, sys.stdout) - else: -- fp = open(filename, 'r') -+ fp = open(filename, 'r', encoding='utf-8') - outfile = os.path.basename(filename) - i = outfile.rfind('.') - if i > 0: outfile = outfile[:i] - modname = outfile.upper() - outfile = modname + '.py' -- outfp = open(outfile, 'w') -+ outfp = open(outfile, 'w', encoding='utf-8') - outfp.write('# Generated by h2py from %s\n' % filename) - filedict = {} - for dir in searchdirs: --- -1.8.1.2 -
meta/recipes-devtools/python/python3/0001-python3-use-cc_basename-to-replace-CC-for-checking-c.patch deleted +0 -140
140 lines not on this page · raw message
meta/recipes-devtools/python/python3/0002-Makefile-add-target-to-split-profile-generation.patch deleted +0 -40
@@ -1,40 +0,0 @@ -From 98586d6dc598e40b8b821b0dde57599e188a7ca4 Mon Sep 17 00:00:00 2001 -From: Anuj Mittal <[email protected]> -Date: Tue, 7 Aug 2018 16:43:17 +0800 -Subject: [PATCH 2/2] Makefile: add target to split profile generation - -We don't want to have profile task invoked from here and want to use -qemu-user instead. Split the profile-opt task so qemu can be invoked -once binaries have been built with instrumentation and then we can go -ahead and build again using the profile data generated. - -Upstream-Status: Inappropriate [OE-specific] - -Signed-off-by: Anuj Mittal <[email protected]> ---- - Makefile.pre.in | 6 ++---- - 1 file changed, 2 insertions(+), 4 deletions(-) - -diff --git a/Makefile.pre.in b/Makefile.pre.in -index 84bc3ff..017a2c4 100644 ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -469,13 +469,12 @@ profile-opt: - $(MAKE) profile-removal - $(MAKE) build_all_generate_profile - $(MAKE) profile-removal -- @echo "Running code to generate profile data (this can take a while):" -- $(MAKE) run_profile_task -- $(MAKE) build_all_merge_profile -+ -+clean_and_use_profile: - @echo "Rebuilding with profile guided optimizations:" - $(MAKE) clean - $(MAKE) build_all_use_profile - $(MAKE) profile-removal - - build_all_generate_profile: - $(MAKE) @DEF_MAKE_RULE@ CFLAGS_NODIST="$(CFLAGS) $(EXTRA_CFLAGS) $(PGO_PROF_GEN_FLAG) @LTOFLAGS@" LDFLAGS="$(LDFLAGS) $(PGO_PROF_GEN_FLAG) @LTOFLAGS@" LIBS="$(LIBS)" --- -2.17.1 -
meta/recipes-devtools/python/python3/0002-bpo-29136-Add-TLS-1.3-cipher-suites-and-OP_NO_TLSv1_.patch deleted +0 -227
227 lines not on this page · raw message
meta/recipes-devtools/python/python3/0003-bpo-32947-Fixes-for-TLS-1.3-and-OpenSSL-1.1.1-GH-876.patch deleted +0 -173
173 lines not on this page · raw message
meta/recipes-devtools/python/python3/0004-bpo-33570-TLS-1.3-ciphers-for-OpenSSL-1.1.1-GH-6976.patch deleted +0 -110
110 lines not on this page · raw message
meta/recipes-devtools/python/python3/0005-bpo-30714-ALPN-changes-for-OpenSSL-1.1.0f-2305.patch deleted +0 -68
68 lines not on this page · raw message
meta/recipes-devtools/python/python3/03-fix-tkinter-detection.patch deleted +0 -42
42 lines not on this page · raw message
meta/recipes-devtools/python/python3/030-fixup-include-dirs.patch deleted +0 -33
@@ -1,33 +0,0 @@ -Do not hardcode /usr into include paths when cross compiling - --Khem - -Upstream-Status: Pending - ---- - setup.py | 15 ++------------- - 1 file changed, 2 insertions(+), 13 deletions(-) - -Index: Python-3.3.2/setup.py -=================================================================== ---- Python-3.3.2.orig/setup.py -+++ Python-3.3.2/setup.py -@@ -444,7 +444,8 @@ class PyBuildExt(build_ext): - # only change this for cross builds for 3.3, issues on Mageia - if cross_compiling: - self.add_gcc_paths() -- self.add_multiarch_paths() -+ if not cross_compiling: -+ self.add_multiarch_paths() - - # Add paths specified in the environment variables LDFLAGS and - # CPPFLAGS for header and library files. -@@ -480,7 +481,7 @@ class PyBuildExt(build_ext): - for directory in reversed(options.dirs): - add_dir_to_list(dir_list, directory) - -- if os.path.normpath(sys.base_prefix) != '/usr' \ -+ if not cross_compiling and os.path.normpath(sys.base_prefix) != '/usr' \ - and not sysconfig.get_config_var('PYTHONFRAMEWORK'): - # OSX note: Don't add LIBDIR and INCLUDEDIR to building a framework - # (PYTHONFRAMEWORK is set) to avoid # linking problems when
meta/recipes-devtools/python/python3/080-distutils-dont_adjust_files.patch deleted +0 -92
92 lines not on this page · raw message
meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch deleted +0 -57
57 lines not on this page · raw message
meta/recipes-devtools/python/python3/130-readline-setup.patch deleted +0 -55
55 lines not on this page · raw message
meta/recipes-devtools/python/python3/150-fix-setupterm.patch deleted +0 -17
@@ -1,17 +0,0 @@ -Fix warning with newer compiler - --Khem - -Upstream-Status: Pending - ---- a/Modules/_cursesmodule.c -+++ b/Modules/_cursesmodule.c -@@ -116,7 +116,7 @@ char *PyCursesVersion = "2.2"; - #defines many common symbols (such as "lines") which breaks the - curses module in other ways. So the code will just specify - explicit prototypes here. */ --extern int setupterm(char *,int,int *); -+//extern int setupterm(char *,int,int *); - #ifdef __sgi - #include <term.h> - #endif
meta/recipes-devtools/python/python3/Use-correct-CFLAGS-for-extensions-when-cross-compili.patch deleted +0 -56
56 lines not on this page · raw message
meta/recipes-devtools/python/python3/avoid-ncursesw-include-path.patch deleted +0 -21
@@ -1,21 +0,0 @@ -Upstream-Status: Pending - -We should make sure that sysroot is used by gcc instead of assuming -hardcoded locations for include paths - - -Signed-off-by: Khem Raj <[email protected]> - -Index: Python-3.4.2/configure.ac -=================================================================== ---- Python-3.4.2.orig/configure.ac -+++ Python-3.4.2/configure.ac -@@ -4434,7 +4434,7 @@ fi - - # first curses header check - ac_save_cppflags="$CPPFLAGS" --CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw" -+CPPFLAGS="$CPPFLAGS -I=/usr/include/ncursesw" - - AC_CHECK_HEADERS(curses.h ncurses.h) -
meta/recipes-devtools/python/python3/avoid_warning_about_tkinter.patch deleted +0 -29
@@ -1,29 +0,0 @@ -_tkinter module needs tk module along with tcl. tk is not yet integrated -in yocto so we skip the check for this module. -Avoid a warning by not adding this module to missing variable. - -Upstream-Status: Inappropriate [distribution] - -Also simply disable the tk module since its not in DEPENDS. -Signed-off-by: Andrei Gherzan <[email protected]> - -Index: Python-3.5.3/setup.py -=================================================================== ---- Python-3.5.3.orig/setup.py -+++ Python-3.5.3/setup.py -@@ -1558,10 +1558,12 @@ class PyBuildExt(build_ext): - self.extensions.extend(exts) - - # 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') - - ## # Uncomment these lines if you want to play with xxmodule.c - ## ext = Extension('xx', ['xxmodule.c'])
meta/recipes-devtools/python/python3/cgi_py.patch deleted +0 -23
@@ -1,23 +0,0 @@ -Lib/cgi.py: Update the script as mentioned in the comment - -Upstream-Status: Inappropriate [distribution] - -Signed-off-by: Mark Hatle <[email protected]> - ---- Python-2.6.6/Lib/cgi.py.orig 2010-08-01 22:14:27.000000000 -0500 -+++ Python-2.6.6/Lib/cgi.py 2011-09-21 15:28:40.478208631 -0500 -@@ -1,13 +1,4 @@ --#! /usr/local/bin/python -- --# NOTE: the above "/usr/local/bin/python" is NOT a mistake. It is --# intentionally NOT "/usr/bin/env python". On many systems --# (e.g. Solaris), /usr/local/bin is not in $PATH as passed to CGI --# scripts, and /usr/local/bin is the default directory where Python is --# installed, so /usr/bin/env would be unable to find python. Granted, --# binary installations by Linux vendors often install Python in --# /usr/bin. So let those vendors patch cgi.py to match their choice --# of installation. -+#! /usr/bin/env python - - """Support module for CGI (Common Gateway Interface) scripts. -
meta/recipes-devtools/python/python3/configure.ac-fix-LIBPL.patch deleted +0 -30
@@ -1,30 +0,0 @@ -From 7c4f8d87473d6238c120ec6031b58f83a17a39a5 Mon Sep 17 00:00:00 2001 -From: Robert Yang <[email protected]> -Date: Mon, 28 Dec 2015 22:52:06 -0800 -Subject: [PATCH] configure.ac: fix LIBPL - -Use LIBDIR rather than prefix/lib, so that it would work when lib64. - -Upstream-Status: Pending - -Signed-off-by: Robert Yang <[email protected]> ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 63aef8e..aefb27f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -4366,7 +4366,7 @@ AC_MSG_RESULT($LDVERSION) - - dnl define LIBPL after ABIFLAGS and LDVERSION is defined. - AC_SUBST(PY_ENABLE_SHARED) --LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}" -+LIBPL='$(LIBDIR)'"/python${VERSION}/config-${LDVERSION}" - AC_SUBST(LIBPL) - - # Check whether right shifting a negative integer extends the sign bit --- -1.7.9.5 -
meta/recipes-devtools/python/python3/create_manifest3.py deleted +0 -433
433 lines not on this page · raw message
meta/recipes-devtools/python/python3/fix_for_using_different_libdir.patch deleted +0 -54
54 lines not on this page · raw message
meta/recipes-devtools/python/python3/float-endian.patch deleted +0 -212
212 lines not on this page · raw message
meta/recipes-devtools/python/python3/ftplib.patch deleted +0 -60
60 lines not on this page · raw message
meta/recipes-devtools/python/python3/get_module_deps3.py deleted +0 -146
146 lines not on this page · raw message
meta/recipes-devtools/python/python3/host_include_contamination.patch deleted +0 -28
@@ -1,28 +0,0 @@ -when building python for qemux86-64 on ubuntu 11.10/64bit -it gropes into host includes and then mixes them with cross -includes and as a result some modules fail to compile and link -one of the modules is python-elementtree which is then not -found during image creation - -Proble is that setup.py tries to add native includes that newer -ubuntu has introduced for multiarch support. But that should -only happen for native builds and not cross building python -so we add a check here. - -Signed-off-by: Khem Raj <[email protected]> -Upstream-Status: Pending - -Index: Python-3.3.0rc2/setup.py -=================================================================== ---- Python-3.3.0rc2.orig/setup.py 2012-09-20 21:54:50.000000000 -0700 -+++ Python-3.3.0rc2/setup.py 2012-09-20 21:57:35.029123858 -0700 -@@ -402,6 +402,9 @@ - - if not find_executable('dpkg-architecture'): - return -+ if cross_compiling: -+ return -+ - opt = '' - if cross_compiling: - opt = '-t' + sysconfig.get_config_var('HOST_GNU_TYPE')
meta/recipes-devtools/python/python3/pass-missing-libraries-to-Extension-for-mul.patch deleted +0 -82
82 lines not on this page · raw message
meta/recipes-devtools/python/python3/python-3.3-multilib.patch deleted +0 -363
212 lines not on this page · raw message
meta/recipes-devtools/python/python3/python-config.patch deleted +0 -46
46 lines not on this page · raw message
meta/recipes-devtools/python/python3/python3-manifest.json deleted +0 -1242
1,242 lines not on this page · raw message
meta/recipes-devtools/python/python3/python3-use-CROSSPYTHONPATH-for-PYTHON_FOR_BUILD.patch deleted +0 -25
Lines of this file are not shown. View the raw message.
meta/recipes-devtools/python/python3/regen-all.patch deleted +0 -25
Lines of this file are not shown. View the raw message.
meta/recipes-devtools/python/python3/run-ptest deleted +0 -3
Lines of this file are not shown. View the raw message.
meta/recipes-devtools/python/python3/setup.py-check-cross_compiling-when-get-FLAGS.patch deleted +0 -50
50 lines not on this page · raw message
meta/recipes-devtools/python/python3/setuptweaks.patch deleted +0 -57
57 lines not on this page · raw message
meta/recipes-devtools/python/python3/signal.patch deleted +0 -56
56 lines not on this page · raw message
meta/recipes-devtools/python/python3/sitecustomize.py deleted +0 -37
Lines of this file are not shown. View the raw message.
meta/recipes-devtools/python/python3/support_SOURCE_DATE_EPOCH_in_py_compile.patch deleted +0 -97
97 lines not on this page · raw message
meta/recipes-devtools/python/python3/sysconfig.py-add-_PYTHON_PROJECT_SRC.patch deleted +0 -51
51 lines not on this page · raw message
meta/recipes-devtools/python/python3/sysroot-include-headers.patch deleted +0 -35
Lines of this file are not shown. View the raw message.
meta/recipes-devtools/python/python3/tweak-MULTIARCH-for-powerpc-linux-gnuspe.patch deleted +0 -52
52 lines not on this page · raw message
meta/recipes-devtools/python/python3/tweak-MULTIARCH-for-powerpc-linux-musl.patch deleted +0 -40
Lines of this file are not shown. View the raw message.
meta/recipes-devtools/python/python3/unixccompiler.patch deleted +0 -35
Lines of this file are not shown. View the raw message.
meta/recipes-devtools/python/python3_3.5.6.bb deleted +0 -334
334 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.17.1
Part of the diff is not shown here. View the raw message.
PATCH 3/3 python: make the python 3.x version of 2to3 utility the default one
In reply to Alexander Kanavin--- meta/recipes-devtools/python/python/python2-manifest.json | 2 +- meta/recipes-devtools/python/python_2.7.15.bb | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-)
meta/recipes-devtools/python/python/python2-manifest.json +1 -1
@@ -109,7 +109,7 @@ "core" ], "files": [ - "${bindir}/2to3", + "${bindir}/2to3*", "${libdir}/python2.7/lib2to3" ] },
meta/recipes-devtools/python/python_2.7.15.bb +3 -0
@@ -131,6 +131,9 @@ do_install() { if [ -z "${@bb.utils.filter('PACKAGECONFIG', 'bdb', d)}" ]; then rm -rf ${D}/${libdir}/python${PYTHON_MAJMIN}/bsddb fi + + # Python 3.x version of 2to3 is now the default + mv ${D}/${bindir}/2to3 ${D}/${bindir}/2to3-${PYTHON_MAJMIN} } do_install_append_class-nativesdk () {
Signature · 1 line
2.17.1