subtree updates
meta-raspberrypi: 62a84833d9..b6a1645a97:
Andrei Gherzan (22):
ci: Migrate worflow to using latest git-mirror-me-action revision
ci: Run the cancel workflow on generic workers and update action
ci: Run the compliance workflow on generic workers
ci: Run the mirror workflow on generic workers
ci: Don't run yocto builds on PRs that don't affect them
raspberrypi-tools.inc: Bump to latest revision
rpi-gpio: Bump to 0.7.1
python3-adafruit-platformdetect: Bump to 3.27.0
python3-adafruit-circuitpython-register: Bump to 1.9.10
userland: Bump revision to the current HEAD
bluez-firmware-rpidistro: Backport patch to fix CYW43455 and various CVEs
linux-raspberrypi: Update 5.15 recipe to 5.15.56
linux-raspberrypi: Update 5.10 recipe to latest revision
linux-firmware-rpidistro: Update to 1:20210315-3+rpt7 release
omxplayer: Bump to latest revision
linux-firmware-rpidistro: Revamp, cleanup and restructure recipe
linux-firmware-rpidistro: Guard the recipe under a license flag
ci: Set LICENSE_FLAGS_ACCEPTED in builder docker container
README.md: Mention Yocto Compatible Layer
README.md: Refactor top table
Add initial version of CODE_OF_CONDUCT.md
Use a png with transparency for balena logo
Vincent Davis Jr (1):
docs: remove backticks
poky: 4161dbbbd6..fc59c28724:
Aatir Manzur (1):
ref-manual: Sphinx note directive for DISTRO_FEATURES definition
Alejandro Hernandez Samaniego (1):
package.bbclass: Fix kernel source handling when not using externalsrc
Alex Kiernan (1):
bind: Remove legacy python3 PACKAGECONFIG code
Alexander Kanavin (61):
conf/local.conf.sample: mention site.conf.sample as well
sato-icon-theme: check for new commits rather than tags
gcr: exclude x.9y versions from upstream version check
efibootmgr: update 17 -> 18
systemd-boot: update 251.2 -> 251.3
libva: upgrade 2.14.0 -> 2.15.0
libva-utils: update 2.14.0 -> 2.15.0
xev: update 1.2.4 -> 1.2.5
xmodmap: update 1.0.10 -> 1.0.11
xf86-input-synaptics: update 1.9.1 -> 1.9.2
xf86-video-cirrus: update 1.5.3 -> 1.6.0
encodings: update 1.0.5 -> 1.0.6
font-util: update 1.3.2 -> 1.3.3
linux-firmware: update 20220610 -> 20220708
rt-tests: update 2.3 -> 2.4
libgit2: update 1.4.3 -> 1.5.0
u-boot: update 2022.04 -> 2022.07
go: update 1.18.3 -> 1.18.4
llvm: update 14.0.4 -> 14.0.6
vulkan-samples: update to latest revision
xserver-xorg: update 21.1.3 -> 21.1.4
alsa-lib: upgrade 1.2.7.1 -> 1.2.7.2
alsa-ucm-conf: upgrade 1.2.7.1 -> 1.2.7.2
diffoscope: upgrade 217 -> 218
git: upgrade 2.37.0 -> 2.37.1
hdparm: upgrade 9.63 -> 9.64
libdrm: upgrade 2.4.111 -> 2.4.112
libhandy: upgrade 1.6.2 -> 1.6.3
libidn2: upgrade 2.3.2 -> 2.3.3
libnl: upgrade 3.6.0 -> 3.7.0
libnotify: upgrade 0.7.12 -> 0.8.0
libuv: upgrade 1.44.1 -> 1.44.2
log4cplus: upgrade 2.0.7 -> 2.0.8
meson: upgrade 0.62.2 -> 0.63.0
mmc-utils: upgrade to latest revision
mpg123: upgrade 1.30.0 -> 1.30.1
pango: upgrade 1.50.7 -> 1.50.8
piglit: upgrade to latest revision
python3-dtschema: upgrade 2022.5 -> 2022.7
python3-hypothesis: upgrade 6.48.2 -> 6.50.1
python3-setuptools-rust: upgrade 1.3.0 -> 1.4.1
python3-setuptools-scm: upgrade 7.0.3 -> 7.0.5
python3-setuptools: upgrade 62.6.0 -> 63.2.0
python3-zipp: upgrade 3.8.0 -> 3.8.1
sqlite3: upgrade 3.39.0 -> 3.39.1
vala: upgrade 0.56.1 -> 0.56.2
wayland-protocols: upgrade 1.25 -> 1.26
webkitgtk: upgrade 2.36.3 -> 2.36.4
xwayland: upgrade 22.1.2 -> 22.1.3
epiphany: upgrade 42.2 -> 42.3
xf86-input-keyboard: remove the recipe
toolchain-scripts.bbclass: adjust toolchain_create_tree_env_script to better replicate (e)SDK
meta-ide-support: adjust to provide (e)SDK experience directly in a yocto build
oeqa/sdk: add a test class for running SDK tests directly in a Yocto build
oeqa/sdk: allow epoxy/galculator tests to run in esdk and direct yocto builds
meson: provide relocation script and native/cross wrappers also for meson-native
selftest/meta_ide: add a test for running SDK tests directly in a yocto build
scripts/oe-setup-builddir: make it known where configurations come from
devtool/upgrade: correctly clean up when recipe filename isn't yet known
devtool/upgrade: catch bb.fetch2.decodeurl errors
poky-floating-revisions.inc: remove xf86-input-keyboard entry
Aníbal Limón (1):
rng-tools: Change systemd service name to work with sysvinit
Armin Kuster (1):
poky.conf: remove EOL and Centos7 hosts
Aryaman Gupta (1):
bitbake: runqueue: add cpu/io pressure regulation
Changhyeok Bae (1):
repo: upgrade 2.27 -> 2.28
Chen Qi (2):
glibc: make glibc-dev depend on kernel headers
image_types_wic.bbclass: fix cross binutils dependency
Daniel Gomez (1):
dropbear: Add configuration file to CONFFILES
Dmitry Baryshkov (1):
linux-firwmare: restore WHENCE_CHKSUM variable
He Zhe (1):
lttng-modules: Fix build failure for kernel v5.15.58
Hitendra Prajapati (1):
qemu: CVE-2022-35414 can perform an uninitialized read on the translate_fail path, leading to an io_readx or io_writex crash
Jan Kiszka (2):
wic/bootimg-efi: Factor out some common bits
wic/bootimg-efi: Add support for loading devicetree files
Jan Vermaete (1):
python3-jsonschema: 4.7.1 -> 4.7.2 + fixed the rdepends
Jose Quaresma (5):
bitbake: bitbake: bitbake-user-manual: hashserv can be accessed on a dedicated domain
archiver.bbclass: remove unsed do_deploy_archives[dirs]
bitbake: bb/utils: remove: check the path again the expand python glob
bitbake: bb/utils: movefile: use the logger for printing
create-spdx: ignore packing control files from ipk and deb
Joshua Watt (3):
sstatesig: Include all dependencies in SPDX task signatures
bitbake: asyncrpc: Add TCP Keep Alives
classes/sanity: Add comment about github & gitlab archives
Kai Kang (1):
mesa: fix compile error when debug build enabled
Khem Raj (11):
lua: Backport fix for CVE-2022-33099
gcc-runtime: Pass -nostartfiles when building dummy libstdc++.so
gcc-runtime: Use --with-target-subdir for baremetal targets
systemd: Drop backported patch applied in 251.3
gcc-runtime: Use static dummy libstdc++
libgcc: Fix standalone target builds with usrmerge distro feature
systemd: Fix conflict between glibc mount.h and kernel mount.h
libarchive: Avoid mount.h conflict between kernel and glibc
btrfs-tools: Use linux/mount.h instead of sys/mount.h
gcc-sanitizers: Fix mount.h glibc 2.36 conflict
hdparm: Fix build with glibc 2.36
LUIS ENRIQUEZ (1):
kernel-fitimage.bbclass: add padding algorithm property in config nodes
Lee Chee Yang (1):
migration guides: release notes for 4.0.2
Mark Hatle (4):
runqemu: Add missing space on default display option
default-distrovars: seccomp doesn't support microblaze
openssl: Move microblaze to linux-latomic config
elfutils: Microblaze does not support symvers
Martin Beeger (1):
cmake: remove CMAKE_ASM_FLAGS variable in toolchain file
Martin Jansa (6):
python3-setuptools: move patch from 'files' to 'python3-setuptools'
kernel.bbclass: pass LD also in savedefconfig
ltp: fix build with ld-is-gold in DISTRO_FEATURES
pybootchartgui: render memory pressure as well
pybootchartgui: fix 2 SyntaxWarnings
pybootchartgui: write the max values in the graph legend
Michael Opdenacker (2):
docs: BB_HASHSERVE_UPSTREAM: update to new host
bitbake: bitbake-user-manual: npm fetcher: improve description of SRC_URI format
Mihai Lindner (2):
wic/plugins/rootfs: Fix NameError for 'orig_path'
create-spdx: Fix supplier field
Ming Liu (2):
rootfs-postcommands.bbclass: move host-user-contaminated.txt to ${S}
udev-extraconf:mount.sh: fix a umount issue
Mingli Yu (1):
strace: set COMPATIBLE_HOST for riscv32
Otavio Salvador (2):
cargo-cross-canadian: Use SDK's flags during target linking
oeqa/sdk: Add basic rust cargo test
Petr Vorel (1):
ltp: Add post release runtime fixes
Quentin Schulz (2):
docs: ref-manual: variables: remove sphinx directive from literal block
docs: auto-generate releases.rst
Randy MacLeod (1):
vim: update from 9.0.0063 to 9.0.0115
Richard Purdie (16):
curl: Fix determinism issues in ptest package
build-appliance-image: Update to master head revision
base/reproducible: Change Source Date Epoch generation methods
vim: Upgrade 9.0.0021 -> 9.0.0063
rust-common: Set llvm-target correctly for cross SDK targets
rust-cross-canadian: Fix ordering of target json config generation
rust-cross/rust-common: Merge arm target handling code to fix cross-canadian
rust-cross: Simplfy the rust_gen_target calls
rust-common/rust-cross: Clean up target json generation code
rust-target-config: Create new class to contain target json config generation
rust-target-config: Allow the targets generated to be configurable
native: Clear TUNE_FEATURES/ABIEXTENSION
populate_sdk: Add SDK toolchain language selection support
populate_sdk_base: Fix mingw override name
poky: Enable debug-kernel for SPDX license manifests
oeqa/sdk/rust: Fix file deletion for multilib SDKs
Roland Hieber (1):
devtool: error out when workspace is using old override syntax
Ross Burton (13):
pulseaudio: add m4-native to DEPENDS
python3-picobuild: upgrade to 0.2
oeqa/runtime: add test that the kernel has CONFIG_PREEMPT_RT enabled
perf: fix reproduciblity in older releases of Linux
zstd: do verbose builds
zlib: remove historical movement of libz.so to /lib
oeqa/selftest: rename git.py to intercept.py
oeqa/gotoolchain: put writable files in the Go module cache
oeqa/gotoolchain: set CGO_ENABLED=1
qemu: add io_uring PACKAGECONFIG
wic: add target tools to PATH when executing native commands
wic/bootimg-efi: use cross objcopy when building unified kernel image
wic: depend on cross-binutils
Shruthi Ravichandran (2):
initscripts: run umountnfs as a KILL script
package_manager/ipk: do not pipe stderr to stdout
Tom Hochstein (2):
gobject-introspection-data: Disable cache for g-ir-scanner
uboot-config.bbclass: Raise error for bad key
gr embeter (1):
efivar: fix import functionality
leimaohui (1):
systemd: Added base_bindir into pkg_postinst:udev-hwdb.
wangmy (10):
python3-docutils: upgrade 0.18.1 -> 0.19
python3-attrs: upgrade 21.4.0 -> 22.1.0
python3-cython: upgrade 0.29.30 -> 0.29.32
python3-dbusmock: upgrade 0.28.1 -> 0.28.4
python3-hatchling: upgrade 1.5.0 -> 1.6.0
python3-jsonschema: upgrade 4.7.2 -> 4.9.0
python3-scons: upgrade 4.3.0 -> 4.4.0
python3-setuptools: upgrade 63.2.0 -> 63.3.0
python3-pygobject: upgrade 3.42.1 -> 3.42.2
python3-pip: upgrade 22.1.2 -> 22.2.1
meta-security: 7ad5f6a9da..2a2d650ee0:
Alex Kiernan (1):
bubblewrap: Add recipe
Armin Kuster (28):
packagegroup-core-security.bb: add bubblewrap to pkg grp
packagegroup-security-tpm: add libhoth to pkg grp
python3-privacyidea: update to 3.7.2
suricata: update to 6.0.5
chipsec: update to 1.8.7
fail2ban: add UPSTREAM_CHECK vars
ibmtpm2tss: fix SRC_URI
tpm2-tss-engine: add UPSTREAM_CHECK_URI
tpm2-tss: add UPSTREAM_CHECK_URI
tpm2-tools: Add UPSTREAM_CHECK_URI
tpm2-openssl: Add UPSTREAM_CHECK_URI
tpm2-pkcs11: Add UPSTREAM_CHECK_URI
tpm2-abrmd: add UPSTREAM_CHECK_URI
tpm2-tcti-uefi: Add UPSTREAM_CHECK_URI
aide: add UPSTREAM_CHECK_URI
ecryptfs-utils: add UPSTREAM_CHECK_URI
krill: update to 0.9.6
packagegroup-core-security: add krill to pkg grps
packagegroup-core-security: add chipsec pkg to grp
apparmor: update to 3.0.5
clamav: update to 0.104.4
ibmtpm2tss: update version format
ibmswtpm2: fix UPSTREAM_CHECK
ibmswtpm2: update to 1682
swtpm: update to 0.7.3
lkrg: update to 0.9.4
krill: only builds on x86/x86-64 and arm64
packagegroup-core-security: remove krill for some archs
Armpit's Upgrade Helper (1):
libtpm: upgrade 0.9.3 -> 0.9.5
John Edward Broadbent (1):
meta-security: Add recipe for libhoth
Upgrade Helper (1):
sssd: upgrade 2.7.1 -> 2.7.3
meta-arm: 80d60e7b1c..20a629180c:
Peter Hoyes (1):
runfvp: Stop the FVP when telnet shuts down cleanly
meta-openembedded: 31c10bd3e6..2eb39477a7:
Alexander Thoma (1):
Fix tigervnc crash due to missing xkbcomp rdepends
Armin Kuster (1):
bigbuckbunny-1080p: update SRC_URI
Aryaman Gupta (1):
rsyslog: update 8.2202->8.2206
Chen Qi (1):
catfish: fix buildpaths issue
Davide Gardenal (7):
freeradius: ignore patched CVEs
openflow: ignore unrelated CVEs
libplist: ignore patched CVEs
meta-oe: ignore patched CVEs
mongodb: ignore unrelated CVEs
php: ignore patched CVEs
postgresql: ignore unrelated CVE
Gianfranco (1):
vboxguestdrivers: fix build failure on 32 bit architectures
Gianfranco Costamagna (1):
vboxguestdrivers: upgrade 6.1.34 -> 6.1.36
Jan Vermaete (8):
python3-pyzmq: version bump 22.3.0 -> 23.2.0
python3-aspectlib: updated the summary and added a description.
python3-jsonrpcclient: Added the jsonrpcclient Python package
python3-oslash: added the oslash Python package
python3-jsonrpcserver: added the python3-oslash rdepends
python-ptyprocess: fixed test_pass_fds
python3-pyzmq: added ptest
python3-pyzmq: fixed oelint-adv warnings
Johannes Schneider (1):
python3-pystemd: Upgrade 0.8.0 -> 0.10.0
Khem Raj (11):
poco: Link with libatomic on riscv32
python3-antlr4-runtime: Inherit setuptools3 instead of python_setuptools_build_meta
catfish: Inherit setuptools3 instead of python_setuptools_build_meta
python3-pycups: Inherit setuptools3 instead of python_setuptools_build_meta
python3-qface: Inherit setuptools3 instead of python_setuptools_build_meta
xscreensaver: Upgrade to 6.04
poco: Link with libatomic on mips
Revert "catfish: Inherit setuptools3 instead of python_setuptools_build_meta"
Revert "python3-pycups: Inherit setuptools3 instead of python_setuptools_build_meta"
Revert "python3-antlr4-runtime: Inherit setuptools3 instead of python_setuptools_build_meta"
libmtp: Upgrade to 1.1.20
Martin Großhauser (1):
Add runtime dependencies for python3-supervisor
Mingli Yu (1):
s-nail: fix buildpaths issue
Radovan Scasny (1):
libwebsockets: update to version 4.3.2
Ross Burton (9):
python3-cbor2: add missing build dependency
python3-simpleeval: remove 'build' build dependency
python3-pyrad: fix build system specification
python3-pytest-html: fix DEPENDS, don't depend on pip
python3-ansi2html: fix DEPENDS
python3-pytest-helpers-namespace: add missing build dependencies
python3-pyzmq: add missing build dependency
python3-path: add missing build dependencies
python3-pytest-forked: loosen dependency checking
Sergey Kizunov (2):
Add python3-pycares 4.2.1
Add python3-aiodns 3.0.0
Trevor Gamblin (1):
README: Remove maintainer info for tvgamblin
Wang Mingyu (10):
php: upgrade 8.1.7 -> 8.1.8
ndisc6: upgrade 1.0.5 -> 1.0.6
python3-elementpath: upgrade 2.5.3 -> 3.0.1
python3-pymongo: upgrade 4.1.1 -> 4.2.0
python3-pyscaffold: upgrade 4.2.3 -> 4.3
python3-regex: upgrade 2022.7.9 -> 2022.7.24
python3-rsa: upgrade 4.8 -> 4.9
python3-sh: upgrade 1.14.2 -> 1.14.3
python3-werkzeug: upgrade 2.1.2 -> 2.2.0
python3-xmlschema: upgrade 1.11.3 -> 2.0.1
Xu Huan (14):
python3-eth-hash: upgrade 0.3.3 -> 0.4.0
python3-socketio: upgrade 5.6.0 -> 5.7.0
python3-ujson: upgrade 5.3.0 -> 5.4.0
python3-web3: upgrade 5.29.2 -> 5.30.0
python3-fastjsonschema: upgrade 2.15.3 -> 2.16.1
python3-flask: upgrade 2.1.2 -> 2.1.3
python3-googleapis-common-protos: upgrade 1.56.3 -> 1.56.4
python3-iso3166: upgrade 2.0.2 -> 2.1.1
python3-kiwisolver: upgrade 1.4.3 -> 1.4.4
python3-portalocker: upgrade 2.4.0 -> 2.5.1
python3-imageio: upgrade 2.19.3 -> 2.19.5
python3-lz4: upgrade 4.0.1 -> 4.0.2
python3-mypy: upgrade 0.961 -> 0.971
python3-protobuf: upgrade 4.21.2 -> 4.21.3
kazuki0824 (1):
ttf-fonts: fix URIs, upgrade 1.004 -> 2.004
wangmy (30):
gegl: upgrade 0.4.36 -> 0.4.38
libadwaita: upgrade 1.1.2 -> 1.1.3
libgsf: upgrade 1.14.49 -> 1.14.50
nbdkit: upgrade 1.31.10 -> 1.31.12
irssi: upgrade 1.4.1 -> 1.4.2
libp11: upgrade 0.4.11 -> 0.4.12
modemmanager: upgrade 1.18.8 -> 1.18.10
pegtl: upgrade 3.2.6 -> 3.2.7
PATCH] logcheck: upgrade 1.3.23 -> 1.3.24
python3-lru-dict: upgrade 1.1.7 -> 1.1.8
python3-pyfanotify: upgrade 0.1.3 -> 0.2.0
python3-pylint: upgrade 2.14.4 -> 2.14.5
python3-pytest-metadata: upgrade 2.0.1 -> 2.0.2
python3-regex: upgrade 2022.6.2 -> 2022.7.9
python3-socketio: upgrade 5.7.0 -> 5.7.1
python3-stevedore: upgrade 3.5.0 -> 4.0.0
tracker: upgrade 3.3.1 -> 3.3.2
zenity: upgrade 3.42.1 -> 3.43.0
nbdkit: upgrade 1.31.12 -> 1.31.14
stunnel: upgrade 5.64 -> 5.65
unbound: upgrade 1.16.0 -> 1.16.1
wolfssl: upgrade 5.3.0 -> 5.4.0
atkmm-2.36: upgrade 2.36.1 -> 2.36.2
nanopb: upgrade 0.4.5 -> 0.4.6.4
redis-plus-plus: upgrade 1.3.3 -> 1.3.5
redis: upgrade 7.0.2 -> 7.0.4
ser2net: upgrade 4.3.6 -> 4.3.7
unattended-upgrades: upgrade 2.6 -> 2.9.1
valijson: upgrade 0.6 -> 0.7
googlebenchmark: upgrade 1.6.1 -> 1.7.0
zhengruoqin (17):
python3-redis: upgrade 4.3.3 -> 4.3.4
python3-ldap: upgrade 3.4.0 -> 3.4.2
python3-pillow: upgrade 9.1.1 -> 9.2.0
python3-pylint: upgrade 2.14.3 -> 2.14.4
python3-alembic: upgrade 1.8.0 -> 1.8.1
python3-astroid: upgrade 2.11.6 -> 2.12.2
python3-attr: upgrade 0.3.1 -> 0.3.2
python3-blinker: upgrade 1.4 -> 1.5
python3-cmd2: upgrade 2.4.1 -> 2.4.2
python3-ecdsa: upgrade 0.17.0 -> 0.18.0
python3-evdev: upgrade 1.5.0 -> 1.6.0
python3-absl: upgrade 1.1.0 -> 1.2.0
python3-bitarray: upgrade 2.5.1 -> 2.6.0
python3-eth-hash: upgrade 0.4.0 -> 0.5.0
python3-google-api-python-client: upgrade 2.51.0 -> 2.54.0
python3-google-auth: upgrade 2.9.0 -> 2.9.1
python3-graphviz: upgrade 0.20 -> 0.20.1
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I50c531a69ce8abb23e33c380f9228015f2764682
diff --git a/poky/meta/recipes-devtools/python/python3-setuptools-rust/8e9892f08b1248dc03862da86915c2745e0ff7ec.patch b/poky/meta/recipes-devtools/python/python3-setuptools-rust/8e9892f08b1248dc03862da86915c2745e0ff7ec.patch
new file mode 100644
index 0000000..2a531e1
--- /dev/null
+++ b/poky/meta/recipes-devtools/python/python3-setuptools-rust/8e9892f08b1248dc03862da86915c2745e0ff7ec.patch
@@ -0,0 +1,221 @@
+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
+