diff options
Diffstat (limited to 'poky/meta/recipes-devtools/python')
29 files changed, 47 insertions, 347 deletions
diff --git a/poky/meta/recipes-devtools/python/python3-cython_0.29.32.bb b/poky/meta/recipes-devtools/python/python3-cython_0.29.32.bb index 26333cb271..8fed1cf94d 100644 --- a/poky/meta/recipes-devtools/python/python3-cython_0.29.32.bb +++ b/poky/meta/recipes-devtools/python/python3-cython_0.29.32.bb @@ -20,17 +20,17 @@ do_install:append() { PACKAGEBUILDPKGD += "cython_fix_sources" cython_fix_sources () { - for f in ${PKGD}/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}/Cython-${PV}/Cython/Compiler/FlowControl.c \ - ${PKGD}/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}/Cython-${PV}/Cython/Compiler/FusedNode.c \ - ${PKGD}/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}/Cython-${PV}/Cython/Compiler/Scanning.c \ - ${PKGD}/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}/Cython-${PV}/Cython/Compiler/Visitor.c \ - ${PKGD}/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}/Cython-${PV}/Cython/Plex/Actions.c \ - ${PKGD}/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}/Cython-${PV}/Cython/Plex/Scanners.c \ - ${PKGD}/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}/Cython-${PV}/Cython/Runtime/refnanny.c \ - ${PKGD}/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}/Cython-${PV}/Cython/Tempita/_tempita.c \ + for f in ${PKGD}/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}/Cython/Compiler/FlowControl.c \ + ${PKGD}/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}/Cython/Compiler/FusedNode.c \ + ${PKGD}/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}/Cython/Compiler/Scanning.c \ + ${PKGD}/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}/Cython/Compiler/Visitor.c \ + ${PKGD}/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}/Cython/Plex/Actions.c \ + ${PKGD}/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}/Cython/Plex/Scanners.c \ + ${PKGD}/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}/Cython/Runtime/refnanny.c \ + ${PKGD}/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}/Cython/Tempita/_tempita.c \ ${PKGD}${libdir}/${PYTHON_DIR}/site-packages/Cython*/SOURCES.txt; do if [ -e $f ]; then - sed -i -e 's#${WORKDIR}#/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}#g' $f + sed -i -e 's#${WORKDIR}/Cython-${PV}#/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}#g' $f fi done } diff --git a/poky/meta/recipes-devtools/python/python3-dtschema_2022.7.bb b/poky/meta/recipes-devtools/python/python3-dtschema_2022.8.1.bb index dd9092f449..38f646e50a 100644 --- a/poky/meta/recipes-devtools/python/python3-dtschema_2022.7.bb +++ b/poky/meta/recipes-devtools/python/python3-dtschema_2022.8.1.bb @@ -7,7 +7,7 @@ inherit pypi setuptools3 PYPI_PACKAGE = "dtschema" -SRC_URI[sha256sum] = "2238753fa16bee7b26841cced75d745af777b896190f40aff5802992335201bb" +SRC_URI[sha256sum] = "3e56a9920944223d6f93fd51ada19dd8db554ac9182ef52c1c5c9d4966ab30aa" DEPENDS += "python3-setuptools-scm-native" RDEPENDS:${PN} += "python3-ruamel-yaml python3-jsonschema python3-rfc3987" diff --git a/poky/meta/recipes-devtools/python/python3-hatchling_1.6.0.bb b/poky/meta/recipes-devtools/python/python3-hatchling_1.8.1.bb index e06bdf02ec..bfdb664715 100644 --- a/poky/meta/recipes-devtools/python/python3-hatchling_1.6.0.bb +++ b/poky/meta/recipes-devtools/python/python3-hatchling_1.8.1.bb @@ -8,7 +8,7 @@ inherit pypi python_hatchling DEPENDS += "python3-pluggy-native python3-tomli-native python3-pathspec-native python3-packaging-native python3-editables-native" DEPENDS:remove:class-native = "python3-hatchling-native" -SRC_URI[sha256sum] = "bd6e8505de511ac4217ff50927f6d1845494608e401e63a62b830c31fb613544" +SRC_URI[sha256sum] = "448b04b23faed669b2b565b998ac955af4feea66c5deed3a1212ac9399d2e1cd" do_compile:prepend() { export PYTHONPATH=src diff --git a/poky/meta/recipes-devtools/python/python3-hypothesis_6.50.1.bb b/poky/meta/recipes-devtools/python/python3-hypothesis_6.46.11.bb index 0c93c12493..1d9772d4ff 100644 --- a/poky/meta/recipes-devtools/python/python3-hypothesis_6.50.1.bb +++ b/poky/meta/recipes-devtools/python/python3-hypothesis_6.46.11.bb @@ -13,7 +13,7 @@ SRC_URI += " \ file://test_rle.py \ " -SRC_URI[sha256sum] = "1a19ade3b27825cab622c95fcf25182a27a42f97589c163173fcbdafb8621d1e" +SRC_URI[sha256sum] = "f5c1cf61b24b094355577a6b8fbbb8eb54c1b0216fbc0519af97c46bddf43c42" RDEPENDS:${PN} += " \ python3-attrs \ diff --git a/poky/meta/recipes-devtools/python/python3-jsonschema_4.9.0.bb b/poky/meta/recipes-devtools/python/python3-jsonschema_4.9.1.bb index 66e0affc64..125bc6b4d5 100644 --- a/poky/meta/recipes-devtools/python/python3-jsonschema_4.9.0.bb +++ b/poky/meta/recipes-devtools/python/python3-jsonschema_4.9.1.bb @@ -4,7 +4,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=7a60a81c146ec25599a3e1dabb8610a8 \ file://json/LICENSE;md5=9d4de43111d33570c8fe49b4cb0e01af" -SRC_URI[sha256sum] = "df10e65c8f3687a48e93d0d348ce0ce5f897b5a28e9bbcbbe8f7c7eaf019e850" +SRC_URI[sha256sum] = "408c4c8ed0dede3b268f7a441784f74206380b04f93eb2d537c7befb3df3099f" inherit pypi python_hatchling diff --git a/poky/meta/recipes-devtools/python/python3-markdown_3.3.7.bb b/poky/meta/recipes-devtools/python/python3-markdown_3.4.1.bb index c456cecc78..e99c3310ac 100644 --- a/poky/meta/recipes-devtools/python/python3-markdown_3.3.7.bb +++ b/poky/meta/recipes-devtools/python/python3-markdown_3.4.1.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=745aaad0c69c60039e638bff9ffc59ed" inherit pypi python_setuptools_build_meta PYPI_PACKAGE = "Markdown" -SRC_URI[sha256sum] = "cbb516f16218e643d8e0a95b309f77eb118cb138d39a4f27851e6a63581db874" +SRC_URI[sha256sum] = "3b809086bb6efad416156e00a0da66fe47618a5d6918dd688f53f40c8e4cfeff" BBCLASSEXTEND = "native" diff --git a/poky/meta/recipes-devtools/python/python3-more-itertools_8.13.0.bb b/poky/meta/recipes-devtools/python/python3-more-itertools_8.14.0.bb index 94f6f9e4d5..c955f93d9b 100644 --- a/poky/meta/recipes-devtools/python/python3-more-itertools_8.13.0.bb +++ b/poky/meta/recipes-devtools/python/python3-more-itertools_8.14.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/erikrose/more-itertools" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=3396ea30f9d21389d7857719816f83b5" -SRC_URI[sha256sum] = "a42901a0a5b169d925f6f217cd5a190e32ef54360905b9c39ee7db5313bfec0f" +SRC_URI[sha256sum] = "c09443cd3d5438b8dafccd867a6bc1cb0894389e90cb53d227456b0b0bccb750" inherit pypi python_flit_core ptest diff --git a/poky/meta/recipes-devtools/python/python3-numpy_1.23.1.bb b/poky/meta/recipes-devtools/python/python3-numpy_1.23.2.bb index 67ab1d9298..960dcf9410 100644 --- a/poky/meta/recipes-devtools/python/python3-numpy_1.23.1.bb +++ b/poky/meta/recipes-devtools/python/python3-numpy_1.23.2.bb @@ -13,7 +13,7 @@ SRC_URI = "https://github.com/${SRCNAME}/${SRCNAME}/releases/download/v${PV}/${S file://run-ptest \ file://0001-generate_umath.py-do-not-write-full-path-to-output-f.patch \ " -SRC_URI[sha256sum] = "d748ef349bfef2e1194b59da37ed5a29c19ea8d7e6342019921ba2ba4fd8b624" +SRC_URI[sha256sum] = "b78d00e48261fbbd04aa0d7427cf78d18401ee0abd89c7559bbf422e5b1c7d01" UPSTREAM_CHECK_URI = "https://github.com/numpy/numpy/releases" UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)\.tar" diff --git a/poky/meta/recipes-devtools/python/python3-pbr_5.10.0.bb b/poky/meta/recipes-devtools/python/python3-pbr_5.10.0.bb new file mode 100644 index 0000000000..022f834901 --- /dev/null +++ b/poky/meta/recipes-devtools/python/python3-pbr_5.10.0.bb @@ -0,0 +1,4 @@ +inherit setuptools3 +require python-pbr.inc + +SRC_URI[sha256sum] = "cfcc4ff8e698256fc17ea3ff796478b050852585aa5bae79ecd05b2ab7b39b9a" diff --git a/poky/meta/recipes-devtools/python/python3-pbr_5.9.0.bb b/poky/meta/recipes-devtools/python/python3-pbr_5.9.0.bb deleted file mode 100644 index c93b71dbd3..0000000000 --- a/poky/meta/recipes-devtools/python/python3-pbr_5.9.0.bb +++ /dev/null @@ -1,4 +0,0 @@ -inherit setuptools3 -require python-pbr.inc - -SRC_URI[sha256sum] = "e8dca2f4b43560edef58813969f52a56cef023146cbb8931626db80e6c1c4308" diff --git a/poky/meta/recipes-devtools/python/python3-pip/reproducible.patch b/poky/meta/recipes-devtools/python/python3-pip/reproducible.patch deleted file mode 100644 index 0ed0c9177f..0000000000 --- a/poky/meta/recipes-devtools/python/python3-pip/reproducible.patch +++ /dev/null @@ -1,83 +0,0 @@ -Pip installed wheels are not reproducible currently. The direct_url -files encode an installation path and the installed wheels compile -the python files at their location, not their final install location -which is incorrect. - -To fix this, simply disable the direct_urls and pass the "root" to -the python compile function to strip that path out of the compiled -files. - -A version of this patch, perhaps stripping root from the direct_urls -may be something that could be considered by upstream. - -Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> - -Upstream-Status: Pending - -Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> ---- - src/pip/_internal/operations/install/wheel.py | 5 ++++- - src/pip/_internal/req/req_install.py | 5 ++++- - 2 files changed, 8 insertions(+), 2 deletions(-) - -diff --git a/src/pip/_internal/operations/install/wheel.py b/src/pip/_internal/operations/install/wheel.py -index 1af8978..3e48f9b 100644 ---- a/src/pip/_internal/operations/install/wheel.py -+++ b/src/pip/_internal/operations/install/wheel.py -@@ -434,6 +434,7 @@ def _install_wheel( - warn_script_location: bool = True, - direct_url: Optional[DirectUrl] = None, - requested: bool = False, -+ root: str = None, - ) -> None: - """Install a wheel. - -@@ -610,7 +611,7 @@ def _install_wheel( - with warnings.catch_warnings(): - warnings.filterwarnings("ignore") - for path in pyc_source_file_paths(): -- success = compileall.compile_file(path, force=True, quiet=True) -+ success = compileall.compile_file(path, force=True, quiet=True, stripdir=root) - if success: - pyc_path = pyc_output_path(path) - assert os.path.exists(pyc_path) -@@ -721,6 +722,7 @@ def install_wheel( - warn_script_location: bool = True, - direct_url: Optional[DirectUrl] = None, - requested: bool = False, -+ root: str = None, - ) -> None: - with ZipFile(wheel_path, allowZip64=True) as z: - with req_error_context(req_description): -@@ -733,4 +735,5 @@ def install_wheel( - warn_script_location=warn_script_location, - direct_url=direct_url, - requested=requested, -+ root=root, - ) -diff --git a/src/pip/_internal/req/req_install.py b/src/pip/_internal/req/req_install.py -index a1e376c..4c3f1bb 100644 ---- a/src/pip/_internal/req/req_install.py -+++ b/src/pip/_internal/req/req_install.py -@@ -779,7 +779,9 @@ class InstallRequirement: - assert self.local_file_path - direct_url = None - # TODO this can be refactored to direct_url = self.download_info -- if self.editable: -+ if '_PYTHON_SYSCONFIGDATA_NAME' in os.environ: -+ direct_url = None -+ elif self.editable: - direct_url = direct_url_for_editable(self.unpacked_source_directory) - elif self.original_link: - direct_url = direct_url_from_link( -@@ -796,6 +798,7 @@ class InstallRequirement: - warn_script_location=warn_script_location, - direct_url=direct_url, - requested=self.user_supplied, -+ root=root, - ) - self.install_succeeded = True - return --- -2.25.1 - diff --git a/poky/meta/recipes-devtools/python/python3-pip_22.2.1.bb b/poky/meta/recipes-devtools/python/python3-pip_22.2.2.bb index 39349b6026..5b6cccf7ed 100644 --- a/poky/meta/recipes-devtools/python/python3-pip_22.2.1.bb +++ b/poky/meta/recipes-devtools/python/python3-pip_22.2.2.bb @@ -33,9 +33,8 @@ LIC_FILES_CHKSUM = "\ inherit pypi python_setuptools_build_meta SRC_URI += "file://no_shebang_mangling.patch" -SRC_URI += "file://reproducible.patch" -SRC_URI[sha256sum] = "50516e47a2b79e77446f0d05649f0d53772c192571486236b1905492bfc24bac" +SRC_URI[sha256sum] = "3fd1929db052f056d7a998439176d3333fa1b3f6c1ad881de1885c0717608a4b" do_install:append() { rm -f ${D}/${bindir}/pip diff --git a/poky/meta/recipes-devtools/python/python3-pyelftools_0.28.bb b/poky/meta/recipes-devtools/python/python3-pyelftools_0.29.bb index 0ceddcb68a..2199e9ff8e 100644 --- a/poky/meta/recipes-devtools/python/python3-pyelftools_0.28.bb +++ b/poky/meta/recipes-devtools/python/python3-pyelftools_0.29.bb @@ -4,7 +4,7 @@ SECTION = "devel/python" LICENSE = "PD" LIC_FILES_CHKSUM = "file://LICENSE;md5=5ce2a2b07fca326bc7c146d10105ccfc" -SRC_URI[sha256sum] = "53e5609cac016471d40bd88dc410cd90755942c25e58a61021cfdf7abdfeacff" +SRC_URI[sha256sum] = "ec761596aafa16e282a31de188737e5485552469ac63b60cfcccf22263fd24ff" PYPI_PACKAGE = "pyelftools" diff --git a/poky/meta/recipes-devtools/python/python3-pygments_2.12.0.bb b/poky/meta/recipes-devtools/python/python3-pygments_2.13.0.bb index b47e0aff67..59706cc200 100644 --- a/poky/meta/recipes-devtools/python/python3-pygments_2.12.0.bb +++ b/poky/meta/recipes-devtools/python/python3-pygments_2.13.0.bb @@ -5,7 +5,7 @@ LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=36a13c90514e2899f1eba7f41c3ee592" inherit setuptools3 -SRC_URI[sha256sum] = "5eb116118f9612ff1ee89ac96437bb6b49e8f04d8a13b514ba26f620208e26eb" +SRC_URI[sha256sum] = "56a8508ae95f98e2b9bdf93a6be5ae3f7d8af858b43e02c5a2ff083726be40c1" DEPENDS += "\ ${PYTHON_PN} \ diff --git a/poky/meta/recipes-devtools/python/python3-pytz_2022.1.bb b/poky/meta/recipes-devtools/python/python3-pytz_2022.2.1.bb index a4bb4f5c8f..bb7aeeec35 100644 --- a/poky/meta/recipes-devtools/python/python3-pytz_2022.1.bb +++ b/poky/meta/recipes-devtools/python/python3-pytz_2022.2.1.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=1a67fc46c1b596cce5d21209bbe75999" inherit pypi setuptools3 ptest -SRC_URI[sha256sum] = "1e760e2fe6a8163bc0b3d9a19c4f84342afa0a2affebfaa84b01b978a02ecaa7" +SRC_URI[sha256sum] = "cea221417204f2d1a2aa03ddae3e867921971d0d76f14d87abb4414415bbdcf5" RDEPENDS:${PN}:class-target += "\ ${PYTHON_PN}-datetime \ diff --git a/poky/meta/recipes-devtools/python/python3-requests_2.28.1.bb b/poky/meta/recipes-devtools/python/python3-requests_2.28.1.bb index ac8a570160..8de08d2620 100644 --- a/poky/meta/recipes-devtools/python/python3-requests_2.28.1.bb +++ b/poky/meta/recipes-devtools/python/python3-requests_2.28.1.bb @@ -18,6 +18,7 @@ RDEPENDS:${PN} += " \ ${PYTHON_PN}-urllib3 \ ${PYTHON_PN}-chardet \ ${PYTHON_PN}-idna \ + ${PYTHON_PN}-compression \ " CVE_PRODUCT = "requests" diff --git a/poky/meta/recipes-devtools/python/python3-setuptools-rust/8e9892f08b1248dc03862da86915c2745e0ff7ec.patch b/poky/meta/recipes-devtools/python/python3-setuptools-rust/8e9892f08b1248dc03862da86915c2745e0ff7ec.patch deleted file mode 100644 index 2a531e17aa..0000000000 --- a/poky/meta/recipes-devtools/python/python3-setuptools-rust/8e9892f08b1248dc03862da86915c2745e0ff7ec.patch +++ /dev/null @@ -1,221 +0,0 @@ -From 8e9892f08b1248dc03862da86915c2745e0ff7ec Mon Sep 17 00:00:00 2001 -From: "Andrew J. Hesford" <ajh@sideband.org> -Date: Fri, 15 Jul 2022 10:33:02 -0400 -Subject: [PATCH] build_rust: remove linker handling that broke cross - compilation - -Upstream-Status: Submitted [https://github.com/PyO3/setuptools-rust/pull/269] -Signed-off-by: Alexander Kanavin <alex@linutronix.de> ---- - setuptools_rust/build.py | 151 ++------------------------------------- - 1 file changed, 7 insertions(+), 144 deletions(-) - -diff --git a/setuptools_rust/build.py b/setuptools_rust/build.py -index 4fe594b..e81ed8f 100644 ---- a/setuptools_rust/build.py -+++ b/setuptools_rust/build.py -@@ -113,23 +113,10 @@ def build_extension( - self, ext: RustExtension, forced_target_triple: Optional[str] = None - ) -> List["_BuiltModule"]: - -- target_info = self._detect_rust_target(forced_target_triple) -- if target_info is not None: -- target_triple = target_info.triple -- cross_lib = target_info.cross_lib -- linker = target_info.linker -- # We're ignoring target_info.linker_args for now because we're not -- # sure if they will always do the right thing. Might help with some -- # of the OS-specific logic if it does. -- -- else: -- target_triple = None -- cross_lib = None -- linker = None -- -+ target_triple = self._detect_rust_target(forced_target_triple) - rustc_cfgs = get_rustc_cfgs(target_triple) - -- env = _prepare_build_environment(cross_lib) -+ env = _prepare_build_environment() - - if not os.path.exists(ext.path): - raise DistutilsFileError( -@@ -150,9 +137,6 @@ def build_extension( - - rustflags = [] - -- if linker is not None: -- rustflags.extend(["-C", "linker=" + linker]) -- - if ext._uses_exec_binding(): - command = [self.cargo, "build", "--manifest-path", ext.path, *cargo_args] - -@@ -407,45 +391,12 @@ def _py_limited_api(self) -> _PyLimitedApi: - - def _detect_rust_target( - self, forced_target_triple: Optional[str] = None -- ) -> Optional["_TargetInfo"]: -+ ) -> Optional[str]: - assert self.plat_name is not None -- cross_compile_info = _detect_unix_cross_compile_info() -- if cross_compile_info is not None: -- cross_target_info = cross_compile_info.to_target_info() -- if forced_target_triple is not None: -- if ( -- cross_target_info is not None -- and not cross_target_info.is_compatible_with(forced_target_triple) -- ): -- self.warn( -- f"Forced Rust target `{forced_target_triple}` is not " -- f"compatible with deduced Rust target " -- f"`{cross_target_info.triple}` - the built package " -- f" may not import successfully once installed." -- ) -- -- # Forcing the target in a cross-compile environment; use -- # the cross-compile information in combination with the -- # forced target -- return _TargetInfo( -- forced_target_triple, -- cross_compile_info.cross_lib, -- cross_compile_info.linker, -- cross_compile_info.linker_args, -- ) -- elif cross_target_info is not None: -- return cross_target_info -- else: -- raise DistutilsPlatformError( -- "Don't know the correct rust target for system type " -- f"{cross_compile_info.host_type}. Please set the " -- "CARGO_BUILD_TARGET environment variable." -- ) -- -- elif forced_target_triple is not None: -+ if forced_target_triple is not None: - # Automatic target detection can be overridden via the CARGO_BUILD_TARGET - # environment variable or --target command line option -- return _TargetInfo.for_triple(forced_target_triple) -+ return forced_target_triple - - # Determine local rust target which needs to be "forced" if necessary - local_rust_target = _adjusted_local_rust_target(self.plat_name) -@@ -457,7 +408,7 @@ def _detect_rust_target( - # check for None first to avoid calling to rustc if not needed - and local_rust_target != get_rust_host() - ): -- return _TargetInfo.for_triple(local_rust_target) -+ return local_rust_target - - return None - -@@ -547,91 +498,6 @@ class _BuiltModule(NamedTuple): - path: str - - --class _TargetInfo(NamedTuple): -- triple: str -- cross_lib: Optional[str] -- linker: Optional[str] -- linker_args: Optional[str] -- -- @staticmethod -- def for_triple(triple: str) -> "_TargetInfo": -- return _TargetInfo(triple, None, None, None) -- -- def is_compatible_with(self, target: str) -> bool: -- if self.triple == target: -- return True -- -- # the vendor field can be ignored, so x86_64-pc-linux-gnu is compatible -- # with x86_64-unknown-linux-gnu -- if _replace_vendor_with_unknown(self.triple) == target: -- return True -- -- return False -- -- --class _CrossCompileInfo(NamedTuple): -- host_type: str -- cross_lib: Optional[str] -- linker: Optional[str] -- linker_args: Optional[str] -- -- def to_target_info(self) -> Optional[_TargetInfo]: -- """Maps this cross compile info to target info. -- -- Returns None if the corresponding target information could not be -- deduced. -- """ -- # hopefully an exact match -- targets = get_rust_target_list() -- if self.host_type in targets: -- return _TargetInfo( -- self.host_type, self.cross_lib, self.linker, self.linker_args -- ) -- -- # the vendor field can be ignored, so x86_64-pc-linux-gnu is compatible -- # with x86_64-unknown-linux-gnu -- without_vendor = _replace_vendor_with_unknown(self.host_type) -- if without_vendor is not None and without_vendor in targets: -- return _TargetInfo( -- without_vendor, self.cross_lib, self.linker, self.linker_args -- ) -- -- return None -- -- --def _detect_unix_cross_compile_info() -> Optional["_CrossCompileInfo"]: -- # See https://github.com/PyO3/setuptools-rust/issues/138 -- # This is to support cross compiling on *NIX, where plat_name isn't -- # necessarily the same as the system we are running on. *NIX systems -- # have more detailed information available in sysconfig. We need that -- # because plat_name doesn't give us information on e.g., glibc vs musl. -- host_type = sysconfig.get_config_var("HOST_GNU_TYPE") -- build_type = sysconfig.get_config_var("BUILD_GNU_TYPE") -- -- if not host_type or host_type == build_type: -- # not *NIX, or not cross compiling -- return None -- -- if "apple-darwin" in host_type and (build_type and "apple-darwin" in build_type): -- # On macos and the build and host differ. This is probably an arm -- # Python which was built on x86_64. Don't try to handle this for now. -- # (See https://github.com/PyO3/setuptools-rust/issues/192) -- return None -- -- stdlib = sysconfig.get_path("stdlib") -- assert stdlib is not None -- cross_lib = os.path.dirname(stdlib) -- -- bldshared = sysconfig.get_config_var("BLDSHARED") -- if not bldshared: -- linker = None -- linker_args = None -- else: -- [linker, _, linker_args] = bldshared.partition(" ") -- -- return _CrossCompileInfo(host_type, cross_lib, linker, linker_args) -- -- - def _replace_vendor_with_unknown(target: str) -> Optional[str]: - """Replaces vendor in the target triple with unknown. - -@@ -644,7 +510,7 @@ def _replace_vendor_with_unknown(target: str) -> Optional[str]: - return "-".join(components) - - --def _prepare_build_environment(cross_lib: Optional[str]) -> Dict[str, str]: -+def _prepare_build_environment() -> Dict[str, str]: - """Prepares environment variables to use when executing cargo build.""" - - # Make sure that if pythonXX-sys is used, it builds against the current -@@ -665,9 +531,6 @@ def _prepare_build_environment(cross_lib: Optional[str]) -> Dict[str, str]: - } - ) - -- if cross_lib: -- env.setdefault("PYO3_CROSS_LIB_DIR", cross_lib) -- - env.pop("CARGO", None) - return env - diff --git a/poky/meta/recipes-devtools/python/python3-setuptools-rust_1.4.1.bb b/poky/meta/recipes-devtools/python/python3-setuptools-rust_1.5.1.bb index c63a3f2b52..24a4f4abef 100644 --- a/poky/meta/recipes-devtools/python/python3-setuptools-rust_1.4.1.bb +++ b/poky/meta/recipes-devtools/python/python3-setuptools-rust_1.5.1.bb @@ -9,9 +9,10 @@ BUGTRACKER = "https://github.com/PyO3/setuptools-rust/issues" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=011cd92e702dd9e6b1a26157b6fd53f5" -SRC_URI = "https://files.pythonhosted.org/packages/67/08/e1aa2c582c62ac76e4d60f8e454bd3bba933781a06a88b4e38797445822a/setuptools-rust-${PV}.tar.gz \ - file://8e9892f08b1248dc03862da86915c2745e0ff7ec.patch" -SRC_URI[sha256sum] = "18ff850831f58ee21d5783825c99fad632da21e47645e9427fd7dec048029e76" +SRC_URI = "${PYPI_SRC_URI} \ + https://files.pythonhosted.org/packages/67/08/e1aa2c582c62ac76e4d60f8e454bd3bba933781a06a88b4e38797445822a/setuptools-rust-${PV}.tar.gz \ + " +SRC_URI[sha256sum] = "0e05e456645d59429cb1021370aede73c0760e9360bbfdaaefb5bced530eb9d7" inherit cargo pypi python_setuptools_build_meta diff --git a/poky/meta/recipes-devtools/python/python3-setuptools/0001-conditionally-do-not-fetch-code-by-easy_install.patch b/poky/meta/recipes-devtools/python/python3-setuptools/0001-conditionally-do-not-fetch-code-by-easy_install.patch index 9c5ff6ad9f..c8c713c842 100644 --- a/poky/meta/recipes-devtools/python/python3-setuptools/0001-conditionally-do-not-fetch-code-by-easy_install.patch +++ b/poky/meta/recipes-devtools/python/python3-setuptools/0001-conditionally-do-not-fetch-code-by-easy_install.patch @@ -1,4 +1,4 @@ -From 3a5ae454c0738510daf5df68b7968cab66cceb7f Mon Sep 17 00:00:00 2001 +From 42d349031cd952c12620fcf02cbab70a371f4b19 Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> Date: Tue, 17 Jul 2018 10:13:38 +0800 Subject: [PATCH] conditionally do not fetch code by easy_install diff --git a/poky/meta/recipes-devtools/python/python3-setuptools_63.3.0.bb b/poky/meta/recipes-devtools/python/python3-setuptools_65.0.2.bb index da7e7892fd..1a639ea333 100644 --- a/poky/meta/recipes-devtools/python/python3-setuptools_63.3.0.bb +++ b/poky/meta/recipes-devtools/python/python3-setuptools_65.0.2.bb @@ -11,7 +11,7 @@ SRC_URI:append:class-native = " file://0001-conditionally-do-not-fetch-code-by-e SRC_URI += "file://0001-change-shebang-to-python3.patch \ file://0001-_distutils-sysconfig.py-make-it-possible-to-substite.patch" -SRC_URI[sha256sum] = "273b6847ae61f7829c1affcdd9a32f67aa65233be508f4fbaab866c5faa4e408" +SRC_URI[sha256sum] = "101bf15ca723beef42c8db91a761f3748d4d697e17fae904db60c0b619d8d094" DEPENDS += "${PYTHON_PN}" diff --git a/poky/meta/recipes-devtools/python/python3-sphinx_5.0.2.bb b/poky/meta/recipes-devtools/python/python3-sphinx_5.1.1.bb index 46cc26e67e..1bef20c2e2 100644 --- a/poky/meta/recipes-devtools/python/python3-sphinx_5.0.2.bb +++ b/poky/meta/recipes-devtools/python/python3-sphinx_5.1.1.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=72c536e78c21c567311b193fe00cd253" PYPI_PACKAGE = "Sphinx" -SRC_URI[sha256sum] = "b18e978ea7565720f26019c702cd85c84376e948370f1cd43d60265010e1c7b0" +SRC_URI[sha256sum] = "ba3224a4e206e1fbdecf98a4fae4992ef9b24b85ebf7b584bb340156eaf08d89" inherit setuptools3 pypi diff --git a/poky/meta/recipes-devtools/python/python3-urllib3_1.26.10.bb b/poky/meta/recipes-devtools/python/python3-urllib3_1.26.12.bb index a8e2073d71..1cd69bcb10 100644 --- a/poky/meta/recipes-devtools/python/python3-urllib3_1.26.10.bb +++ b/poky/meta/recipes-devtools/python/python3-urllib3_1.26.12.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/shazow/urllib3" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=c2823cb995439c984fd62a973d79815c" -SRC_URI[sha256sum] = "879ba4d1e89654d9769ce13121e0f94310ea32e8d2f8cf587b77c08bbcdb30d6" +SRC_URI[sha256sum] = "3fa96cf423e6987997fc326ae8df396db2a8b7c667747d47ddd8ecba91f4a74e" inherit pypi setuptools3 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 index 62dce4b827..c790c7b886 100644 --- 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 @@ -1,4 +1,4 @@ -From c83256e40d3057ac6325d649f9ce4c4da2c00874 Mon Sep 17 00:00:00 2001 +From 7589ab03ad3f7cb4bb092c31273ff22371ac77e4 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 @@ -11,10 +11,10 @@ Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com> 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py -index f7a3d39..9d2273d 100644 +index c3a6b5e..c892537 100644 --- a/setup.py +++ b/setup.py -@@ -857,8 +857,8 @@ class PyBuildExt(build_ext): +@@ -856,8 +856,8 @@ class PyBuildExt(build_ext): add_dir_to_list(self.compiler.include_dirs, sysconfig.get_config_var("INCLUDEDIR")) diff --git a/poky/meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch b/poky/meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch index a9240b3c8a..641017edd5 100644 --- a/poky/meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch +++ b/poky/meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch @@ -1,4 +1,4 @@ -From 01d209277e145072e478d8b9acfea3638ee16cdc Mon Sep 17 00:00:00 2001 +From d82cb96eed1098920ad3cdcb36feb32137618066 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex@linutronix.de> Date: Fri, 10 Sep 2021 12:28:31 +0200 Subject: [PATCH] Lib/sysconfig.py: use prefix value from build configuration 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 3c62c2acb8..368a725ff7 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 78dd1def953e18e7cda0325bb26d27c051bb6890 Mon Sep 17 00:00:00 2001 +From c24674e0a52367359a1a3d950bab8bc3d282279b 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 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 6bb85fcb34..2c7d264da0 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 @@ -14,7 +14,7 @@ x86_64-wrs-linux-gcc: error: unrecognized command line option '-fp-model' Here use cc_basename to replace CC for checking compiler to avoid such kind of issue. -Upstream-Status: Pending +Upstream-Status: Submitted [https://github.com/python/cpython/pull/96399] Signed-off-by: Li Zhou <li.zhou@windriver.com> 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 0ead57e465..041a03b0cd 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 246c5ffe75a2d494e415d8a7522df9fe22056d41 Mon Sep 17 00:00:00 2001 +From 311cf9abc213fcd76795cc3a25814a15fb552065 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 @@ -18,7 +18,7 @@ Signed-off-by: Alejandro Hernandez Samaniego <alejandro@enedino.org> 1 file changed, 8 insertions(+) diff --git a/setup.py b/setup.py -index 2be4738..62f0e18 100644 +index 934cf2e..ccf83b4 100644 --- a/setup.py +++ b/setup.py @@ -517,6 +517,14 @@ class PyBuildExt(build_ext): @@ -35,4 +35,4 @@ index 2be4738..62f0e18 100644 + if self.missing: print() - print("Python build finished successfully!") + print("The necessary bits to build these optional modules were not " 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 de4c6c4e19..a06e9b56c1 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 33b5a31df6050110f4481a24f5a0a0bf7fe80096 Mon Sep 17 00:00:00 2001 +From 1cc4cab8d579bbccb8a4fc13a28158a58c603cb4 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 diff --git a/poky/meta/recipes-devtools/python/python3_3.10.5.bb b/poky/meta/recipes-devtools/python/python3_3.10.6.bb index b237c48735..1b28728732 100644 --- a/poky/meta/recipes-devtools/python/python3_3.10.5.bb +++ b/poky/meta/recipes-devtools/python/python3_3.10.6.bb @@ -44,7 +44,7 @@ SRC_URI:append:class-native = " \ file://12-distutils-prefix-is-inside-staging-area.patch \ file://0001-Don-t-search-system-for-headers-libraries.patch \ " -SRC_URI[sha256sum] = "8437efd5b106ef0a75aabfbf23d880625120a73a86a22ade4d2e2e68d7b74486" +SRC_URI[sha256sum] = "f795ff87d11d4b0c7c33bc8851b0c28648d8a4583aa2100a98c22b4326b6d3f3" # exclude pre-releases for both python 2.x and 3.x UPSTREAM_CHECK_REGEX = "[Pp]ython-(?P<pver>\d+(\.\d+)+).tar" @@ -171,6 +171,9 @@ do_install:append:class-native() { # Nothing should be looking into ${B} for python3-native sed -i -e 's:${B}:/build/path/unavailable/:g' \ ${D}/${libdir}/python${PYTHON_MAJMIN}/config-${PYTHON_MAJMIN}${PYTHON_ABI}*/Makefile + + # disable the lookup in user's site-packages globally + sed -i 's#ENABLE_USER_SITE = None#ENABLE_USER_SITE = False#' ${D}${libdir}/python${PYTHON_MAJMIN}/site.py } do_install:append() { |