Update to Rust and Cargo 1.37.0.
This commit is contained in:
@@ -0,0 +1,31 @@
|
|||||||
|
From 42e65192b6f7520b7a05924856e00600961f6758 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Johan Anderholm <johan.anderholm@gmail.com>
|
||||||
|
Date: Sun, 27 Jan 2019 10:19:00 +0100
|
||||||
|
Subject: [PATCH] Disable http2
|
||||||
|
|
||||||
|
http2 requires that curl is build with nghttp2 which in turn depends on
|
||||||
|
many dependencies and ultimately a dependency loop in the case of
|
||||||
|
curl-native. As long as multiplexing is disabled in cargo this should
|
||||||
|
be fine.
|
||||||
|
|
||||||
|
Upstream-Status: Inappropriate
|
||||||
|
---
|
||||||
|
Cargo.toml | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/Cargo.toml b/Cargo.toml
|
||||||
|
index c3fcacf5..bd6ec50b 100644
|
||||||
|
--- a/Cargo.toml
|
||||||
|
+++ b/Cargo.toml
|
||||||
|
@@ -24,7 +24,7 @@ bytesize = "1.0"
|
||||||
|
crates-io = { path = "src/crates-io", version = "0.25" }
|
||||||
|
crossbeam-utils = "0.6"
|
||||||
|
crypto-hash = "0.3.1"
|
||||||
|
-curl = { version = "0.4.21", features = ['http2'] }
|
||||||
|
+curl = { version = "0.4.21" }
|
||||||
|
curl-sys = "0.4.18"
|
||||||
|
env_logger = "0.6.0"
|
||||||
|
pretty_env_logger = { version = "0.3", optional = true }
|
||||||
|
--
|
||||||
|
2.11.0
|
||||||
|
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
require recipes-devtools/rust/rust-source-${PV}.inc
|
||||||
|
require recipes-devtools/rust/rust-snapshot-${PV}.inc
|
||||||
|
require cargo.inc
|
||||||
|
|
||||||
|
LIC_FILES_CHKSUM += " \
|
||||||
|
file://LICENSE-APACHE;md5=71b224ca933f0676e26d5c2e2271331c \
|
||||||
|
file://LICENSE-THIRD-PARTY;md5=f257ad009884cb88a3a87d6920e7180a \
|
||||||
|
"
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
require rust-source-${PV}.inc
|
||||||
|
require libstd-rs.inc
|
||||||
|
|
||||||
|
LIC_FILES_CHKSUM = "file://../../COPYRIGHT;md5=93a95682d51b4cb0a633a97046940ef0"
|
||||||
|
|
||||||
|
CARGO_FEATURES ?= "panic-unwind backtrace"
|
||||||
|
|
||||||
|
CARGO_VENDORING_DIRECTORY = "${RUSTSRC}/vendor"
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
require rust-cross.inc
|
||||||
|
require rust-source-${PV}.inc
|
||||||
|
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
require rust-source-${PV}.inc
|
||||||
|
require rust-llvm.inc
|
||||||
|
|
||||||
|
LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=c6b766a4e85dd28301eeed54a6684648"
|
||||||
|
|
||||||
|
do_install_prepend () {
|
||||||
|
# the install does a sed on this without installing the file
|
||||||
|
# we don't need it for anything
|
||||||
|
mkdir -p "${D}/usr/share/llvm/cmake"
|
||||||
|
touch "${D}/usr/share/llvm/cmake/LLVMExports-noconfig.cmake"
|
||||||
|
}
|
||||||
|
|
||||||
|
do_install_append () {
|
||||||
|
# we don't need any of this stuff to build Rust
|
||||||
|
rm -rf "${D}/usr/lib/cmake"
|
||||||
|
}
|
||||||
@@ -0,0 +1,24 @@
|
|||||||
|
## This is information on the rust-snapshot (binary) used to build our current release.
|
||||||
|
## snapshot info is taken from rust/src/stage0.txt
|
||||||
|
## TODO: find a way to add additional SRC_URIs based on the contents of an
|
||||||
|
## earlier SRC_URI.
|
||||||
|
RS_VERSION = "1.36.0"
|
||||||
|
|
||||||
|
RUSTC_SNAPSHOT = "rustc-${RS_VERSION}-${BUILD_ARCH}-unknown-linux-gnu"
|
||||||
|
RUST_STD_SNAPSHOT = "rust-std-${RS_VERSION}-${BUILD_ARCH}-unknown-linux-gnu"
|
||||||
|
CARGO_VERSION = "0.37.0"
|
||||||
|
CARGO_SNAPSHOT = "cargo-${CARGO_VERSION}-${BUILD_ARCH}-unknown-linux-gnu"
|
||||||
|
|
||||||
|
SRC_URI += " \
|
||||||
|
https://static.rust-lang.org/dist/${RUSTC_SNAPSHOT}.tar.xz;name=rustc-snapshot-${BUILD_ARCH};subdir=rust-snapshot-components \
|
||||||
|
https://static.rust-lang.org/dist/${RUST_STD_SNAPSHOT}.tar.xz;name=rust-std-snapshot-${BUILD_ARCH};subdir=rust-snapshot-components \
|
||||||
|
https://static.rust-lang.org/dist/${CARGO_SNAPSHOT}.tar.xz;name=cargo-snapshot-${BUILD_ARCH};subdir=rust-snapshot-components \
|
||||||
|
"
|
||||||
|
|
||||||
|
# TODO: Add hashes for other architecture toolchains as well. Make a script?
|
||||||
|
SRC_URI[rustc-snapshot-x86_64.md5sum] = "ec27794c94cc1df1a0a69f7244a09176"
|
||||||
|
SRC_URI[rustc-snapshot-x86_64.sha256sum] = "fff0158da6f5af2a89936dc3e0c361077c06c2983eb310615e02f81ebbde1416"
|
||||||
|
SRC_URI[rust-std-snapshot-x86_64.md5sum] = "b71a6fd6f44527c3bf09584e89ad8958"
|
||||||
|
SRC_URI[rust-std-snapshot-x86_64.sha256sum] = "ce8e12684b568a8a4f7d346a743383429849cf3f028f5712ad3d3e31590c8db3"
|
||||||
|
SRC_URI[cargo-snapshot-x86_64.md5sum] = "8c661276a0da7a1aa48affbe33b347e6"
|
||||||
|
SRC_URI[cargo-snapshot-x86_64.sha256sum] = "d20fa121951339d5492cf8862f8a7af59efc99d18f3c27b95ab6d4658b6a7d67"
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
SRC_URI += "https://static.rust-lang.org/dist/rustc-${PV}-src.tar.xz;name=rust"
|
||||||
|
|
||||||
|
SRC_URI[rust.md5sum] = "ee6300b1d7e5767115492915c4c0d8ef"
|
||||||
|
SRC_URI[rust.sha256sum] = "10abffac50a729cf74cef6dd03193a2f4647541bd19ee9281be9e5b12ca8cdfd"
|
||||||
|
|
||||||
|
# later versions of rust change the directory that they unextract to
|
||||||
|
RUSTSRC = "${WORKDIR}/rustc-${PV}-src"
|
||||||
|
# set this as our default
|
||||||
|
S = "${RUSTSRC}"
|
||||||
|
|
||||||
|
LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=93a95682d51b4cb0a633a97046940ef0"
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
require rust.inc
|
||||||
|
require rust-source-${PV}.inc
|
||||||
|
require rust-snapshot-${PV}.inc
|
||||||
|
|
||||||
|
DEPENDS += "rust-llvm (=${PV})"
|
||||||
|
|
||||||
|
# Otherwise we'll depend on what we provide
|
||||||
|
INHIBIT_DEFAULT_RUST_DEPS_class-native = "1"
|
||||||
|
# We don't need to depend on gcc-native because yocto assumes it exists
|
||||||
|
PROVIDES_class-native = "virtual/${TARGET_PREFIX}rust"
|
||||||
|
|
||||||
|
BBCLASSEXTEND = "native"
|
||||||
Reference in New Issue
Block a user