From 97323f10b74b3ee17dd80d2f55a11dd95b3ab5e8 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex@linutronix.de>
Date: Wed, 4 Dec 2024 07:49:17 +0100
Subject: [PATCH] cargo-c: convert to target recipe

This was prompted by sstatetests.SStateHashSameSigs2.test_sstate_allarch_samesigs
where adwaita-icon-theme would fail due to new librsvg introducing
cargo-c-native into dependency path.

Rather than look into why is that, I simply converted the recipe
into the standard 'target + BBCLASSEXTEND' approach.

(From OE-Core rev: 80a2673a3081e623f30f25cc773ac9217e717958)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/conf/distro/include/maintainers.inc                       | 2 +-
 ...e_0.10.5+cargo-0.83.0.bb => cargo-c_0.10.5+cargo-0.83.0.bb} | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)
 rename meta/recipes-devtools/rust/{cargo-c-native_0.10.5+cargo-0.83.0.bb => cargo-c_0.10.5+cargo-0.83.0.bb} (86%)

diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc
index 5a90d8d7b4..3d5f712150 100644
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -91,7 +91,7 @@ RECIPE_MAINTAINER:pn-bzip2 = "Denys Dmytriyenko <denis@denix.org>"
 RECIPE_MAINTAINER:pn-ca-certificates = "Unassigned <unassigned@yoctoproject.org>"
 RECIPE_MAINTAINER:pn-cairo = "Anuj Mittal <anuj.mittal@intel.com>"
 RECIPE_MAINTAINER:pn-cargo = "Randy MacLeod <Randy.MacLeod@windriver.com>"
-RECIPE_MAINTAINER:pn-cargo-c-native = "Frederic Martinsons <frederic.martinsons@gmail.com>"
+RECIPE_MAINTAINER:pn-cargo-c = "Frederic Martinsons <frederic.martinsons@gmail.com>"
 RECIPE_MAINTAINER:pn-cantarell-fonts = "Unassigned <unassigned@yoctoproject.org>"
 RECIPE_MAINTAINER:pn-ccache = "Robert Yang <liezhi.yang@windriver.com>"
 RECIPE_MAINTAINER:pn-cdrtools-native = "Yi Zhao <yi.zhao@windriver.com>"
diff --git a/meta/recipes-devtools/rust/cargo-c-native_0.10.5+cargo-0.83.0.bb b/meta/recipes-devtools/rust/cargo-c_0.10.5+cargo-0.83.0.bb
similarity index 86%
rename from meta/recipes-devtools/rust/cargo-c-native_0.10.5+cargo-0.83.0.bb
rename to meta/recipes-devtools/rust/cargo-c_0.10.5+cargo-0.83.0.bb
index 728b8757a4..c6e88e6fad 100644
--- a/meta/recipes-devtools/rust/cargo-c-native_0.10.5+cargo-0.83.0.bb
+++ b/meta/recipes-devtools/rust/cargo-c_0.10.5+cargo-0.83.0.bb
@@ -9,9 +9,10 @@ SRC_URI = "crate://crates.io/cargo-c/${PV};name=cargo-c"
 SRC_URI[cargo-c.sha256sum] = "5bfa9ba93806384d940e71dafbc185316e0a6a47561b33b7105fcf67f99df70a"
 S = "${CARGO_VENDORING_DIRECTORY}/cargo-c-${PV}"
 
-inherit cargo cargo-update-recipe-crates pkgconfig native
+inherit cargo cargo-update-recipe-crates pkgconfig
 
 DEPENDS = "openssl curl"
 
 require ${BPN}-crates.inc
 
+BBCLASSEXTEND = "native"