These match the default from the class so drop them. We then always
generate all targets so remove the configuration from the class.
(From OE-Core rev: e4d56256936c55bab2bf2934ccbde9157ef7dc57)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
cargo ends up running target-rust-ccld with LD_LIBRARY_PATH set to libdir but not
base_libdir which breaks the SDK. You see errors like:
/bin/sh: error while loading shared libraries: libncurses.so.5: cannot open shared object file: No such file or directory
On such a system, this would fail:
LD_LIBRARY_PATH="<path>/testimage-sdk/sysroots/x86_64-pokysdk-linux/usr/lib" cargo build
but this would work:
LD_LIBRARY_PATH="<path>/testimage-sdk/sysroots/x86_64-pokysdk-linux/usr/lib:<path>/testimage-sdk/sysroots/x86_64-pokysdk-linux/lib" cargo build
so wrap cargo with both paths in LD_LIBRARY_PATH.
The error depends on the versions of the host system, it reproduced on tumbleweed-ty-3.
(From OE-Core rev: 388e7cac9f90e79ce8c3c1683d8ee0f4df1bc907)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The cargo-cross-candian variant made no sense as one version of cargo in
the SDK can work for all targets. Replace it with nativesdk-cargo instead.
Move the SDK env to rust-cross-canadian.
(From OE-Core rev: 6d6d135924eff5993736ee58ba8cc5d00ca635f3)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Instead of generating target configuration files centrally and often getting
it wrong, or having trouble finding the right set, generate them dynamically
from the bbclass into WORKDIR per recipe.
(From OE-Core rev: 9160e4a37561d8ac882057450a818621bec13bed)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Remove further code duplication by allowing the main function to be
configurable.
(From OE-Core rev: 2d4b35a0db1220e7a7f1b6776223aa4d40a3f246)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Currently most of the rust recipes use this code but it is all piecemeal.
Turn the code into a class where things can start to be rationalised. Ultimately
some of the data and python code should be moved to a python library but one step
at a time.
No functionality changes.
(From OE-Core rev: 3795285cbf362e13b8151bfdbe1bce999ac28641)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Some of the subtleties in the different codepaths for target rust json generation
were not easy to spot. Start to simplfy the code to make this clearer.
This patch should not have any functionality change although ABIEXTENSION
has to be excluded from the function signature, the triplet would normally
cover anything set there.
(From OE-Core rev: 0f83d959465e0d99f98ade6803281585931d1b02)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Drop the two libstdc patches as they've finally appeared upstream.
Disable the use of libstdc++.a from the host distributions, as it results
in cross-distro contamination in rust-native.
(From OE-Core rev: 94760bc118952160865352c10ca7693680b5ce7e)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This all seems over complicated for something which is basically always
one of two values. This might even help cross-canadian work on something
which isn't x86-64.
(From OE-Core rev: bd36593ba3db758b3eacc974e48468a665967961)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Drop libstd-rs patches as they're merged upstream.
(From OE-Core rev: 05f4a09899aa8dbb22ef1adb494abac41d5b96b7)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This complicates (semi) automated upgrades, and isn't necessary
as we carry only a single version of the toolchain.
(From OE-Core rev: f7a6b23d99fba5855cfb34788199877a14206293)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Various recipes were missing a pkgconfig inherit or pkgconfig-native
dependency despite using pkgconfig.
Add the inherit to igt-gpu-tools/gdb/libmodulemd/libwpe/xwayland/waffle
shaderc/iputils/wpebackend-fdo/lttng-ust/cargo.
(From OE-Core rev: 777d9744570c2dc119dc5d04985896bbb1da5885)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Also add the interpreter relocation trick from uninative to the prebuilt
cargo binary to match rust-native, just in case that causes other problems
later too.
(From OE-Core rev: e3cb3958cc14672feef5d4d8953131f55db68573)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
native/nativesdk variants of a cross-canadian recipe don't make any
sense so avoid these recipe variants.
(From OE-Core rev: 4ba7fb0b6a5021bca73aade4af390e8e017b491a)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
We typically only have one version so remove the older
rust toolchain. This also fixes a maintainers oe-selftest.
(From OE-Core rev: d8ff9672d2686801d535a91fa28a92e38d8f0409)
Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
cargo, rust, and rustfmt can't be built for the targets yet
so exclude them from world builds.
(From OE-Core rev: 3ade1015b5bbd6aac9dd9974a6a5712958a5f5ed)
Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
