Commit Graph

798 Commits

Author SHA1 Message Date
Martin Jansa 71538c8762 rust_versions.inc: switch the default version to 1.49.0
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2021-02-08 17:04:06 +01:00
Martin Jansa c976184935 {cargo,rust}-1.49.0: simplify as in https://github.com/meta-rust/meta-rust/pull/299
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2021-02-08 17:04:06 +01:00
Cody Schafer d15e66ae93 Merge pull request #303 from janderholm/nativebuilds
Fix *-native cargo builds
2021-02-08 10:14:12 -05:00
Cody Schafer 2c34da11f0 Merge pull request #293 from danc86/add-rust-1.49
add rust 1.49.0
2021-02-08 10:10:26 -05:00
Cody Schafer dd7aa2e952 Merge pull request #300 from shr-project/jansa/lic
Few more cleanups
2021-02-08 10:09:34 -05:00
Johan Anderholm 0025cebb12 Fix *-native cargo builds
Normally all *-native packages needs to depend on cargo-native in order
to be able to use cargo. When building cargo-native however, this is not
available and we use a snapshot.

Fixes #302.
2021-02-08 16:04:39 +01:00
Martin Jansa 3ab7542844 rust-source, rust-snaphost: drop md5sums
* for consistency as 1.43.0 and 1.47.0 already use only sha256sum

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2021-02-08 01:11:13 +01:00
Martin Jansa b163a89399 rust-source, rust-snapshot: simplify as well
* move common stuff from rust-source to rust.inc and from rust-snapshot to rust-target.inc

* 1.34.2 checksums were changed because unified SRC_URI is using tar.xz
  for this version as well (instead of tar.gz used before here)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2021-02-08 01:09:52 +01:00
Dan Callaghan 0ee328aa26 add rust 1.49.0
Now it seems `./x.py install` is the only way to assemble a fully
working stage 2 cross-built compiler. See rust-lang/rust#81702.
2021-02-08 08:04:30 +10:00
Cody Schafer c90c9b071a Merge pull request #299 from shr-project/jansa/lic
Further simplify LIC_FILES_CHKSUM
2021-02-07 14:32:55 -05:00
Martin Jansa 3e73030c51 rust-target.inc: add new include file to simplify all rust_*.bb
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2021-02-07 19:50:58 +01:00
Martin Jansa 9c0a1059be rust_versions.inc: add include for easy switching between versions
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2021-02-07 19:36:00 +01:00
Martin Jansa a31a4070d3 cargo: move LIC_FILES_CHKSUM from cargo_*.bb to cargo.inc where LICENSE is set
* only the oldest 1.34.2 is the exception with different value, so
  stop duplicating it

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2021-02-07 19:23:09 +01:00
Martin Jansa 1d64f9075a rust: move LIC_FILES_CHKSUM from rust-source-*.inc to rust.inc where LICENSE is set
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2021-02-07 19:18:00 +01:00
Cody Schafer 433b7214ad Merge pull request #297 from shr-project/jansa/lic
Fix https://github.com/meta-rust/meta-rust/pull/289
2021-02-07 13:14:42 -05:00
Martin Jansa 80c30c3017 rust-llvm-ncsa.inc: reorder to actually set LICENSE and LIC_FILES_CHKSUM
* rust-llvm.inc sets LICENSE and corresponding LIC_FILES_CHKSUM
  for Apache-2.0-with-LLVM-exception, but the recipes which include
  rust-llvm-ncsa.inc need to change it to NCSA.

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2021-02-07 19:03:28 +01:00
Martin Jansa 1cb40bd3c2 Revert "rust-llvm: Use early variable assignment for the license checksum in rust-llvm.inc"
This reverts commit 5dda6c427a.

This breaks rust-llvm builds with:
ERROR: QA Issue: rust-llvm-native: LIC_FILES_CHKSUM points to an invalid file: TOPDIR/BUILD/work/x86_64-linux/rust-llvm-native/1.47.0-r0/rustc-1.47.0-src/src/llvm-project/llvm/COPYRIGHT [license-checksum]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2021-02-07 19:03:28 +01:00
Cody Schafer 805503686f Merge pull request #289 from floion/correct_license_file_assignment
rust-llvm: Use early variable assignment for the license checksum in …
2021-02-07 00:30:47 -05:00
Cody Schafer a6c629733c Merge pull request #290 from YoeDistro/yoe/mut
cargo: Mark the cargo-native dependency specific to target
2021-02-07 00:28:51 -05:00
Cody Schafer 1c18023894 Merge pull request #295 from danc86/fix-lto
libstd-rs: embed bitcode for LTO
2021-02-07 00:27:42 -05:00
Dan Callaghan d5ab20d23b rust-hello-world: enable LTO in the build
If the libstd-rs recipe is not correctly embedding LVM bitcode in its
output, then it can produce a toolchain that appears to work until you
try building a project that requests LTO:

    error: failed to get bitcode from object file for LTO (Bitcode section not found in object file)

Enable LTO for rust-hello-world to give us an easy watch to catch such
problems.
2021-02-05 11:41:47 +10:00
Dan Callaghan b7eacc0996 libstd-rs: embed bitcode for LTO
Fixes #294.
2021-02-05 11:41:47 +10:00
Khem Raj 1936904ad3 cargo: Mark the cargo-native dependency specific to target
Fixes dependency loop

These are usually caused by circular dependencies and any circular dependency chains found will be printed below. Increase the debug level to see a list of unbuildable tasks.

Identifying dependency loops (this may take a short while)...

ERROR:
Dependency loop #1 found:
  Task virtual:native:/mnt/b/yoe/master/sources/meta-rust/recipes-devtools/cargo/cargo_1.47.0.bb:do_compile (dependent Tasks ['cargo_1.47.0.bb:do_configure'])
  Task virtual:native:/mnt/b/yoe/master/sources/meta-rust/recipes-devtools/cargo/cargo_1.47.0.bb:do_install (dependent Tasks ['cargo_1.47.0.bb:do_compile'])
  Task virtual:native:/mnt/b/yoe/master/sources/meta-rust/recipes-devtools/cargo/cargo_1.47.0.bb:do_populate_sysroot (dependent Tasks ['cargo_1.47.0.bb:do_install'])
  Task virtual:native:/mnt/b/yoe/master/sources/meta-rust/recipes-devtools/cargo/cargo_1.47.0.bb:do_prepare_recipe_sysroot (dependent Tasks ['cargo_1.47.0.bb:do_populate_sysroot', 'openssl_1.1.1i.bb:do_populate_sysroot', 'curl_7.74.0.bb:do_populate_sysroot', 'rust_1.47.0.bb:do_populate_sysroot', 'zlib_1.2.11.bb:do_populate_sysroot', 'ca-certificates_20210119.bb:do_populate_sysroot', 'libssh2_1.9.0.bb:do_populate_sysroot', 'cargo_1.47.0.bb:do_fetch'])
  Task virtual:native:/mnt/b/yoe/master/sources/meta-rust/recipes-devtools/cargo/cargo_1.47.0.bb:do_configure (dependent Tasks ['cargo_1.47.0.bb:do_prepare_recipe_sysroot', 'cargo_1.47.0.bb:do_patch', 'cargo_1.47.0.bb:do_rust_create_wrappers', 'cargo_1.47.0.bb:do_cargo_setup_snapshot'])

ERROR: Command execution failed: 1

Signed-off-by: Khem Raj <raj.khem@gmail.com>
2021-01-29 10:18:30 -08:00
Florin Sarbu 5dda6c427a rust-llvm: Use early variable assignment for the license checksum in rust-llvm.inc
Because rust-llvm-ncsa.inc requires rust-llvm.inc we do not want that
the latter overrides the license checksum set in the former.

Signed-off-by: Florin Sarbu <florin@balena.io>
2021-01-28 10:36:54 +01:00
Steven Walter c72b2dda3a Merge pull request #288 from YoeDistro/yoe/mut
Add riscv32/riscv64 support
2021-01-12 10:09:33 -05:00
Khem Raj 47de35e153 libstd-rs: Remove libunwind on riscv
riscv port of libunwind is not available yet

Signed-off-by: Khem Raj <raj.khem@gmail.com>
2021-01-12 00:32:38 -08:00
Khem Raj e2979482dc rust: Add riscv32/riscv64 support
Set the cpu, features, and abi correctly

Signed-off-by: Khem Raj <raj.khem@gmail.com>
2021-01-12 00:31:16 -08:00
Khem Raj a679b6f4c2 rust: Build rust backend
In llvm11 we have both riscv32 or riscv64 backends so enable them

Signed-off-by: Khem Raj <raj.khem@gmail.com>
2021-01-12 00:30:18 -08:00
Steven Walter 8da0936aa8 Merge pull request #287 from YoeDistro/yoe/mut
rust: Correct the data layout for riscv32
2021-01-09 20:10:53 -05:00
Khem Raj a59ddd90d2 rust: Correct the data layout for riscv32
This now matches with llvm target backend in llvm 11

Signed-off-by: Khem Raj <raj.khem@gmail.com>
2021-01-09 12:53:13 -08:00
Steven Walter fa5cdb0de4 Merge pull request #286 from janderholm/buildseparation
Build separation
2021-01-08 16:43:31 -05:00
Johan Anderholm e5ee880894 cargo_common: Make output more readable 2021-01-08 16:48:36 +01:00
Johan Anderholm a673320995 cargo: Enable build separation
Place generated artifacts in the directory suggested by bitbake (${B})
instead of directly in the source directory. This has multiple
advantages such as the ability to share source directory between
multiple machine types without risking cross contamination.
2021-01-08 16:47:40 +01:00
Steven Walter 2a4bb8966a Merge pull request #285 from janderholm/armv7
Use proper llvm-target for armv7
2021-01-08 08:57:56 -05:00
Johan Anderholm cb4f8294d4 Use proper llvm-target for armv7
arm-unknown-linux-gnueabihf was incorrectly used as llvm-target instead
of armv7-unknown-linux-gnueabihf when building for some Cortex A SoCs.
This may cause segfaults in non trivial rust applications on ARMv7
when e.g. +a7 is passed to LLVM. It seems to differ between different
versions of the compiler and LLVM versions.
2021-01-08 10:37:34 +01:00
Steven Walter 7ff669d8ce Merge pull request #284 from danc86/add-rust-1.47
add rust 1.47
2020-12-22 13:26:33 -05:00
Steven Walter 25a20987fb Merge pull request #283 from danc86/add-cargo-1.46
cargo: add missing version 1.46.0
2020-12-22 13:25:04 -05:00
Dan Callaghan 4b151fa804 add rust 1.47.0 2020-12-18 21:05:13 +10:00
Dan Callaghan 8cfc3c9826 clean up some common definitions across rust versions
These bits and pieces had evidently been copy-pasted forward into each
new recipe version, but now they are all identical and can be tidied up.
2020-12-18 21:05:06 +10:00
Dan Callaghan aec6519e23 cargo: add missing version 1.46.0
Rust version 1.46.0 was added to the layer a while back, but the
corresponding cargo recipe seems to have been missed.
2020-12-18 21:04:02 +10:00
Tyler Hall f56fd4ec68 Merge pull request #281 from YoeDistro/yoe/mut
rust-bin.bbclass: Do not use append and += together
2020-11-14 16:44:44 -05:00
Khem Raj 7afffa083c rust-bin.bbclass: Do not use append and += together
this is undefined behavior in bitbake, prepend space instead

Signed-off-by: Khem Raj <raj.khem@gmail.com>
2020-11-14 08:56:18 -08:00
Steven Walter 53bfa32489 Merge pull request #280 from YoeDistro/yoe/mut
layer.conf: Add gatesgarth to LAYERSERIES_COMPAT
2020-10-15 20:05:42 -04:00
Khem Raj 2822b50c04 layer.conf: Add gatesgarth to LAYERSERIES_COMPAT
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2020-10-15 09:28:23 -07:00
Steven Walter 2e085dda43 Merge pull request #279 from ColinFinck/fix/cargo-libgit2-pkgconfig
Disable LIBGIT2_SYS_USE_PKG_CONFIG due to incompatibility with libgit2 0.28.x
2020-10-09 16:23:57 -04:00
Colin Finck 8a44baed44 Disable LIBGIT2_SYS_USE_PKG_CONFIG due to incompatibility with 0.28.x
libgit2 0.28.x is shipped by latest Yocto Dunfell.
According to https://github.com/rust-lang/git2-rs/issues/458#issuecomment-522567539, there are no compatibility guarantees between libgit2-sys and arbitrary system libgit2 versions, so better keep this turned off.

Fixes "invalid version 3 on git_proxy_options" during build.

Further references:
* https://github.com/rust-lang/git2-rs/issues/458
* https://bugs.gentoo.org/707746#c1
2020-10-06 17:35:54 +02:00
Steven Walter 318fb46863 Merge pull request #278 from srwalter/rust-1.46
Add rust 1.46.0
2020-09-02 12:54:14 -04:00
Steven Walter b7f9c1d0d7 Add rust 1.46.0 2020-08-31 14:47:11 -04:00
Steven Walter 7f235b6f89 Merge pull request #277 from shr-project/jansa/parallel
rust: use PARALLEL_MAKE instead of BB_NUMBER_THREADS
2020-05-28 13:56:20 -04:00
Martin Jansa 647b976da2 rust: use PARALLEL_MAKE instead of BB_NUMBER_THREADS
* BB_NUMBER_THREADS is number of bitbake tasks running in
  parallel, not parallelization inside individual tasks
* use oe.utils.parallel_make_argument to make sure it
  works even when people add e.g. "-l 10" in PARALLEL_MAKE
* with the recent improvements for rust-native build time, I wanted
  to rerun some build time tests from
  https://github.com/shr-project/test-oe-build-time
  here are the results on AMD Threadripper 3970x with 128GB ram:

  BB is BB_NUMBER_THREADS
  PM is PARALLEL_MAKE

  TIME   BB        PM   Description
  20:50   *         *   zeus based build with 1.37 rust (BB/PM has no impact)
  14:50   8  32,48,64   dunfell, 1.43 as in https://github.com/meta-rust/meta-rust/commit/d2ff87ca5545b8081b16ac8f53ed4295593208c6 (PM has no impact, because bootstrap uses BB)
   9:50   8  32,48,64   dunfell, 1.43 with this patch applied, it doesn't get faster after some threashold of PM
  13:32   8        64   dunfell, 1.43 with this patch applied and "rust.inc: cut build time in half" (https://github.com/meta-rust/meta-rust/commit/afcb58e5b9cbda7efb1c8a12c980cb2f583728bd) reverted
  13:30   8        64   dunfell, 1.43 with "rust.inc: cut build time in half" (https://github.com/meta-rust/meta-rust/commit/afcb58e5b9cbda7efb1c8a12c980cb2f583728bd) as well as "rust.inc: run bootstrap.py in parallel" (https://github.com/meta-rust/meta-rust/commit/40a6bd8a8d943eff495c7fdeb0bf8452891f6f99) reverted to see if 1.43 builds faster without any meta-rust improvements compared to 1.37
  94:47   1        64   dunfell, 1.43 as in https://github.com/meta-rust/meta-rust/commit/d2ff87ca5545b8081b16ac8f53ed4295593208c6 (either something went wrong or explicit "-j 1" disables some parallelism done by default already
  13:40   *         *   zeus based build with 1.39 rust (BB/PM has no impact)
  10:50   8        64   zeus based build with 1.39 rust as proposed in jansa/new-zeus-branch
  80:51   8         1   zeus based build with 1.39 rust as proposed in jansa/new-zeus-branch with "-j 1" PARALLEL_MAKE

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2020-05-28 18:36:04 +02:00