diff options
| author | Randy MacLeod <Randy.MacLeod@windriver.com> | 2021-08-10 13:52:19 -0400 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-08-26 22:09:43 +0100 |
| commit | 61e1570c6a09c1984e919e8c0a82a74c1a08d821 (patch) | |
| tree | accab4b08aa3c62f098c9bb19399efb46906256a /meta/conf | |
| parent | 705b1d757fa221614f4f72cabf0fac5884cb6bfd (diff) | |
| download | poky-61e1570c6a09c1984e919e8c0a82a74c1a08d821.tar.gz | |
rust: initial merge of most of meta-rust
In the meta-rust repo at commit:
448047c Upgrade to 1.54.0 (#359)
Make the required directories:
mkdir ../oe-core/meta/recipes-devtools/rust
mkdir ../oe-core/meta/recipes-devtools/cargo
mkdir ../oe-core/meta/recipes-example
and then:
cp recipes-devtools/rust/* ../oe-core/meta/recipes-devtools/rust
cp recipes-devtools/cargo/* ../oe-core/meta/recipes-devtools/cargo
cp lib/crate.py ../oe-core/meta/lib
cp recipes-example/* ../oe-core/meta/recipes-example
cp conf/distro/include/rust_* ../oe-core/meta/conf/distro/include/
cp classes/* ../oe-core/meta/classes/
cp recipes-core/packagegroups/packagegroup-rust-cross-canadian.bb ../oe-core/meta/recipes-core/packagegroups
(From OE-Core rev: 3ed57578cca93ff1ba4e0bf3f25566e10659a2f9)
Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
| -rw-r--r-- | meta/conf/distro/include/rust_security_flags.inc | 7 | ||||
| -rw-r--r-- | meta/conf/distro/include/rust_versions.inc | 13 |
2 files changed, 20 insertions, 0 deletions
diff --git a/meta/conf/distro/include/rust_security_flags.inc b/meta/conf/distro/include/rust_security_flags.inc new file mode 100644 index 0000000000..590bef17a0 --- /dev/null +++ b/meta/conf/distro/include/rust_security_flags.inc | |||
| @@ -0,0 +1,7 @@ | |||
| 1 | # Build errors with PIE options enabled | ||
| 2 | SECURITY_CFLAGS:pn-rust-native = "${SECURITY_NO_PIE_CFLAGS}" | ||
| 3 | SECURITY_CFLAGS:pn-rust-cross-${TARGET_ARCH} = "${SECURITY_NO_PIE_CFLAGS}" | ||
| 4 | SECURITY_CFLAGS:pn-rust = "${SECURITY_NO_PIE_CFLAGS}" | ||
| 5 | SECURITY_CFLAGS:pn-rust-llvm = "${SECURITY_NO_PIE_CFLAGS}" | ||
| 6 | |||
| 7 | SECURITY_LDFLAGS:pn-rust-cross-arm = " -lssp_nonshared -lssp" | ||
diff --git a/meta/conf/distro/include/rust_versions.inc b/meta/conf/distro/include/rust_versions.inc new file mode 100644 index 0000000000..a11ba22a8f --- /dev/null +++ b/meta/conf/distro/include/rust_versions.inc | |||
| @@ -0,0 +1,13 @@ | |||
| 1 | # include this in your distribution to easily switch between versions | ||
| 2 | # just by changing RUST_VERSION variable | ||
| 3 | |||
| 4 | RUST_VERSION ?= "1.51.0" | ||
| 5 | |||
| 6 | PREFERRED_VERSION_cargo ?= "${RUST_VERSION}" | ||
| 7 | PREFERRED_VERSION_cargo-native ?= "${RUST_VERSION}" | ||
| 8 | PREFERRED_VERSION_libstd-rs ?= "${RUST_VERSION}" | ||
| 9 | PREFERRED_VERSION_rust ?= "${RUST_VERSION}" | ||
| 10 | PREFERRED_VERSION_rust-cross-${TARGET_ARCH} ?= "${RUST_VERSION}" | ||
| 11 | PREFERRED_VERSION_rust-llvm ?= "${RUST_VERSION}" | ||
| 12 | PREFERRED_VERSION_rust-llvm-native ?= "${RUST_VERSION}" | ||
| 13 | PREFERRED_VERSION_rust-native ?= "${RUST_VERSION}" | ||
