From 6d37bf9f1308fc28b9afcaa39a00e109f98b3c51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Wed, 12 Jun 2024 10:46:58 +0100 Subject: lcitool: add rust-std mapping for mingw MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit QEMU is intending to include support for rust, and thus we need to provide a rust-std mapping for mingw too. Signed-off-by: Daniel P. Berrangé --- lcitool/facts/mappings.yml | 2 ++ lcitool/util.py | 2 ++ tests/data/packages/out/fedora-rawhide-cross-mingw64.yml | 1 + 3 files changed, 5 insertions(+) diff --git a/lcitool/facts/mappings.yml b/lcitool/facts/mappings.yml index 75013a0..fa81b4c 100644 --- a/lcitool/facts/mappings.yml +++ b/lcitool/facts/mappings.yml @@ -1862,6 +1862,8 @@ mappings: rpm: rust-std-static MacOS: rust OpenSUSE: rust + cross-mingw32-rpm: rust-std-static-i686-pc-windows-gnu + cross-mingw64-rpm: rust-std-static-x86_64-pc-windows-gnu cross-policy-default: foreign sanlock: diff --git a/lcitool/util.py b/lcitool/util.py index fd385d8..9976fee 100644 --- a/lcitool/util.py +++ b/lcitool/util.py @@ -203,6 +203,8 @@ def native_arch_to_rust_target(native_arch): "armv6l": "armv5te-unknown-linux-gnueabi", "armv7l": "armv7-unknown-linux-gnueabihf", "i686": "i686-unknown-linux-gnu", + "mingw32": "i686-pc-windows-gnu", + "mingw64": "x86_64-pc-windows-gnu", "mips": "mips-unknown-linux-gnu", "mipsel": "mipsel-unknown-linux-gnu", "mips64el": "mips64el-unknown-linux-gnuabi64", diff --git a/tests/data/packages/out/fedora-rawhide-cross-mingw64.yml b/tests/data/packages/out/fedora-rawhide-cross-mingw64.yml index 06cca64..9f04eb0 100644 --- a/tests/data/packages/out/fedora-rawhide-cross-mingw64.yml +++ b/tests/data/packages/out/fedora-rawhide-cross-mingw64.yml @@ -36,6 +36,7 @@ cross: - mingw64-readline - mingw64-rest - mingw64-spice-gtk3 +- rust-std-static-x86_64-pc-windows-gnu native: - ant - ant-junit -- cgit v1.1