From d231fcb708e4cd158760d7845a8bcba5a0a65b65 Mon Sep 17 00:00:00 2001 From: Doug Goldstein Date: Tue, 10 Oct 2017 11:22:26 -0500 Subject: [PATCH] drop Rust 1.15.1 / Cargo 0.16 --- recipes-devtools/cargo/cargo-0.16.0.inc | 11 -- recipes-devtools/cargo/cargo_0.16.0.bb | 103 ------------------ ...cal-workaround-for-NULL-__dso_handle.patch | 25 ----- recipes-devtools/rust/libstd-rs_1.15.1.bb | 21 ---- recipes-devtools/rust/rust-cross_1.15.1.bb | 3 - recipes-devtools/rust/rust-llvm_1.15.1.bb | 16 --- .../rust/rust-snapshot-1.15.1.inc | 30 ----- recipes-devtools/rust/rust-source-1.15.1.inc | 14 --- recipes-devtools/rust/rust_1.15.1.bb | 30 ----- 9 files changed, 253 deletions(-) delete mode 100644 recipes-devtools/cargo/cargo-0.16.0.inc delete mode 100644 recipes-devtools/cargo/cargo_0.16.0.bb delete mode 100644 recipes-devtools/rust/files/rust-1.15.1/0003-std-thread_local-workaround-for-NULL-__dso_handle.patch delete mode 100644 recipes-devtools/rust/libstd-rs_1.15.1.bb delete mode 100644 recipes-devtools/rust/rust-cross_1.15.1.bb delete mode 100644 recipes-devtools/rust/rust-llvm_1.15.1.bb delete mode 100644 recipes-devtools/rust/rust-snapshot-1.15.1.inc delete mode 100644 recipes-devtools/rust/rust-source-1.15.1.inc delete mode 100644 recipes-devtools/rust/rust_1.15.1.bb diff --git a/recipes-devtools/cargo/cargo-0.16.0.inc b/recipes-devtools/cargo/cargo-0.16.0.inc deleted file mode 100644 index 04d1723..0000000 --- a/recipes-devtools/cargo/cargo-0.16.0.inc +++ /dev/null @@ -1,11 +0,0 @@ -CARGO_SNAPSHOT = "2016-09-01/cargo-nightly-x86_64-unknown-linux-gnu.tar.gz;downloadfilename=cargo-nightly-x86_64-unknown-linux-gnu-2016-09-01.tar.gz" -SRC_URI[cargo-snapshot.md5sum] = "d41ebf79290a7c9c9e5df87cb27e5091" -SRC_URI[cargo-snapshot.sha256sum] = "365e5cad79512d244b8ced32f8e5b86a710fc6c17f0d0f5f744b8058ef6dc756" - -SRC_URI += "\ - https://static.rust-lang.org/cargo-dist/${CARGO_SNAPSHOT};name=cargo-snapshot \ -" - -# When building cargo-native we don't have a built cargo to use so we must use -# the snapshot to bootstrap the build of cargo -CARGO_class-native = "${WORKDIR}/cargo-nightly-${RUST_BUILD_SYS}/cargo/bin/cargo" diff --git a/recipes-devtools/cargo/cargo_0.16.0.bb b/recipes-devtools/cargo/cargo_0.16.0.bb deleted file mode 100644 index 8845982..0000000 --- a/recipes-devtools/cargo/cargo_0.16.0.bb +++ /dev/null @@ -1,103 +0,0 @@ -# Auto-Generated by cargo-bitbake 0.3.8 -# -inherit cargo - -# If this is git based prefer versioned ones if they exist -# DEFAULT_PREFERENCE = "-1" - -# how to get cargo could be as easy as but default to a git checkout: -# SRC_URI += "crate://crates.io/cargo/0.16.0" -SRC_URI += "git://git@github.com/rust-lang/cargo.git;protocol=https;branch=rust-1.15.1" -SRCREV = "6e0c18cccc8b0c06fba8a8d76486f81a792fb420" -S = "${WORKDIR}/git" -CARGO_SRC_DIR="" - - -# please note if you have entries that do not begin with crate:// -# you must change them to how that package can be fetched -SRC_URI += " \ -crate://crates.io/advapi32-sys/0.2.0 \ -crate://crates.io/aho-corasick/0.5.3 \ -crate://crates.io/bitflags/0.7.0 \ -crate://crates.io/bufstream/0.1.2 \ -crate://crates.io/cfg-if/0.1.0 \ -crate://crates.io/cmake/0.1.19 \ -crate://crates.io/crossbeam/0.2.10 \ -crate://crates.io/curl-sys/0.3.6 \ -crate://crates.io/curl/0.4.1 \ -crate://crates.io/docopt/0.6.86 \ -crate://crates.io/env_logger/0.3.5 \ -crate://crates.io/filetime/0.1.10 \ -crate://crates.io/flate2/0.2.14 \ -crate://crates.io/fs2/0.3.0 \ -crate://crates.io/gcc/0.3.39 \ -crate://crates.io/gdi32-sys/0.2.0 \ -crate://crates.io/git2-curl/0.7.0 \ -crate://crates.io/git2/0.6.3 \ -crate://crates.io/glob/0.2.11 \ -crate://crates.io/hamcrest/0.1.1 \ -crate://crates.io/idna/0.1.0 \ -crate://crates.io/kernel32-sys/0.2.2 \ -crate://crates.io/lazy_static/0.2.2 \ -crate://crates.io/libc/0.2.18 \ -crate://crates.io/libgit2-sys/0.6.5 \ -crate://crates.io/libssh2-sys/0.2.4 \ -crate://crates.io/libz-sys/1.0.10 \ -crate://crates.io/log/0.3.6 \ -crate://crates.io/matches/0.1.4 \ -crate://crates.io/memchr/0.1.11 \ -crate://crates.io/miniz-sys/0.1.7 \ -crate://crates.io/miow/0.1.3 \ -crate://crates.io/net2/0.2.26 \ -crate://crates.io/num-bigint/0.1.35 \ -crate://crates.io/num-complex/0.1.35 \ -crate://crates.io/num-integer/0.1.32 \ -crate://crates.io/num-iter/0.1.32 \ -crate://crates.io/num-rational/0.1.35 \ -crate://crates.io/num-traits/0.1.36 \ -crate://crates.io/num/0.1.36 \ -crate://crates.io/num_cpus/1.1.0 \ -crate://crates.io/openssl-probe/0.1.0 \ -crate://crates.io/openssl-sys/0.9.1 \ -crate://crates.io/openssl/0.9.1 \ -crate://crates.io/pkg-config/0.3.8 \ -crate://crates.io/psapi-sys/0.1.0 \ -crate://crates.io/rand/0.3.14 \ -crate://crates.io/regex-syntax/0.3.9 \ -crate://crates.io/regex/0.1.80 \ -crate://crates.io/rustc-serialize/0.3.21 \ -crate://crates.io/semver-parser/0.6.1 \ -crate://crates.io/semver/0.5.1 \ -crate://crates.io/strsim/0.5.1 \ -crate://crates.io/tar/0.4.9 \ -crate://crates.io/tempdir/0.3.5 \ -crate://crates.io/term/0.4.4 \ -crate://crates.io/thread-id/2.0.0 \ -crate://crates.io/thread_local/0.2.7 \ -crate://crates.io/toml/0.2.1 \ -crate://crates.io/unicode-bidi/0.2.3 \ -crate://crates.io/unicode-normalization/0.1.2 \ -crate://crates.io/url/1.2.3 \ -crate://crates.io/user32-sys/0.2.0 \ -crate://crates.io/utf8-ranges/0.1.3 \ -crate://crates.io/winapi-build/0.1.1 \ -crate://crates.io/winapi/0.2.8 \ -crate://crates.io/ws2_32-sys/0.2.1 \ -" - - - -LIC_FILES_CHKSUM=" \ -file://LICENSE-MIT;md5=362255802eb5aa87810d12ddf3cfedb4 \ -file://LICENSE-APACHE;md5=1836efb2eb779966696f473ee8540542 \ -" - -SUMMARY = "Cargo, a package manager for Rust." -HOMEPAGE = "https://crates.io" -LICENSE = "MIT | Apache-2.0" - -# includes this file if it exists but does not fail -# this is useful for anything you may want to override from -# what cargo-bitbake generates. -include cargo-${PV}.inc -include cargo.inc diff --git a/recipes-devtools/rust/files/rust-1.15.1/0003-std-thread_local-workaround-for-NULL-__dso_handle.patch b/recipes-devtools/rust/files/rust-1.15.1/0003-std-thread_local-workaround-for-NULL-__dso_handle.patch deleted file mode 100644 index f50fb41..0000000 --- a/recipes-devtools/rust/files/rust-1.15.1/0003-std-thread_local-workaround-for-NULL-__dso_handle.patch +++ /dev/null @@ -1,25 +0,0 @@ -From bff536002eba2ed322d329d9022ccdc77da458a3 Mon Sep 17 00:00:00 2001 -From: Cody P Schafer -Date: Wed, 3 Dec 2014 19:15:19 -0500 -Subject: [PATCH 3/3] std/thread_local: workaround for NULL __dso_handle - ---- - src/libstd/sys/unix/fast_thread_local.rs | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/libstd/sys/unix/fast_thread_local.rs b/src/libstd/sys/unix/fast_thread_local.rs -index 0c625e7..31e7146 100644 ---- a/src/libstd/sys/unix/fast_thread_local.rs -+++ b/src/libstd/sys/unix/fast_thread_local.rs -@@ -110,7 +110,7 @@ unsafe fn register_dtor(t: *mut u8, dtor: unsafe extern fn(*mut u8)) { - #[linkage = "extern_weak"] - static __cxa_thread_atexit_impl: *const libc::c_void; - } -- if !__cxa_thread_atexit_impl.is_null() { -+ if !__cxa_thread_atexit_impl.is_null() && !__dso_handle.is_null() { - type F = unsafe extern fn(dtor: unsafe extern fn(*mut u8), - arg: *mut u8, - dso_handle: *mut u8) -> libc::c_int; --- -2.10.1 (Apple Git-78) - diff --git a/recipes-devtools/rust/libstd-rs_1.15.1.bb b/recipes-devtools/rust/libstd-rs_1.15.1.bb deleted file mode 100644 index 89f7da8..0000000 --- a/recipes-devtools/rust/libstd-rs_1.15.1.bb +++ /dev/null @@ -1,21 +0,0 @@ -require rust-source-${PV}.inc -require libstd-rs.inc - -LIC_FILES_CHKSUM = "file://../../COPYRIGHT;md5=43e1f1fb9c0ee3af66693d8c4fecafa8" - -# Don't use jemalloc as it doesn't work for many targets. -# https://github.com/rust-lang/rust/pull/37392 -CARGO_BUILD_FLAGS += "--features 'panic-unwind'" - -SRC_URI += "\ - crate://crates.io/cmake/0.1.18 \ - crate://crates.io/env_logger/0.3.5 \ - crate://crates.io/filetime/0.1.10 \ - crate://crates.io/gcc/0.3.40 \ - crate://crates.io/getopts/0.2.14 \ - crate://crates.io/libc/0.2.17 \ - crate://crates.io/log/0.3.6 \ - crate://crates.io/num_cpus/0.2.13 \ - crate://crates.io/rustc-serialize/0.3.19 \ - crate://crates.io/toml/0.1.30 \ -" diff --git a/recipes-devtools/rust/rust-cross_1.15.1.bb b/recipes-devtools/rust/rust-cross_1.15.1.bb deleted file mode 100644 index 34d92de..0000000 --- a/recipes-devtools/rust/rust-cross_1.15.1.bb +++ /dev/null @@ -1,3 +0,0 @@ -require rust-cross.inc -require rust-source-${PV}.inc -require rust-snapshot-${PV}.inc diff --git a/recipes-devtools/rust/rust-llvm_1.15.1.bb b/recipes-devtools/rust/rust-llvm_1.15.1.bb deleted file mode 100644 index 7c296d2..0000000 --- a/recipes-devtools/rust/rust-llvm_1.15.1.bb +++ /dev/null @@ -1,16 +0,0 @@ -require rust-source-${PV}.inc -require rust-llvm.inc - -LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=b99eb43c934ceebecab85c6b9b1a08be" - -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" -} diff --git a/recipes-devtools/rust/rust-snapshot-1.15.1.inc b/recipes-devtools/rust/rust-snapshot-1.15.1.inc deleted file mode 100644 index 85b4d4b..0000000 --- a/recipes-devtools/rust/rust-snapshot-1.15.1.inc +++ /dev/null @@ -1,30 +0,0 @@ -# Specifics for Rust 1.15.1 - -## 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.14.0" - -RUST_STD_SNAPSHOT = "rust-std-${RS_VERSION}-${RUST_BUILD_SYS}" -RUSTC_SNAPSHOT = "rustc-${RS_VERSION}-${RUST_BUILD_SYS}" -CARGO_REV = "fbeea902d2c9a5be6d99cc35681565d8f7832592" -CARGO_SNAPSHOT = "cargo-nightly-${RUST_BUILD_SYS}" - -SRC_URI += " \ - https://static.rust-lang.org/dist/${RUST_STD_SNAPSHOT}.tar.gz;name=rust-std-snapshot;subdir=rust-snapshot-components \ - https://static.rust-lang.org/dist/${RUSTC_SNAPSHOT}.tar.gz;name=rustc-snapshot;subdir=rust-snapshot-components \ -" - -# Downloaded cargo tarballs must be named differently to distinguish between versions. -SRC_URI += " \ - https://s3.amazonaws.com/rust-lang-ci/cargo-builds/${CARGO_REV}/${CARGO_SNAPSHOT}.tar.gz;name=cargo-snapshot;subdir=rust-snapshot-components;downloadfilename=${CARGO_SNAPSHOT}-${CARGO_REV}.tar.gz \ -" - -# These are x86_64-unknown-linux-gnu hashes, how can we add more? -SRC_URI[rustc-snapshot.md5sum] = "f178d9d6aad0f87c451f4b2f93170633" -SRC_URI[rustc-snapshot.sha256sum] = "0eeec4211aa872f24c220200a0c2b095bbfc9c0f737c1c5df2555967c8f36787" -SRC_URI[rust-std-snapshot.md5sum] = "518e492fc3d50d8c678056eb788bd0e7" -SRC_URI[rust-std-snapshot.sha256sum] = "3a609bfe9572c742d71199faad578ee76abe9067cd8df698bda6e3ef5caf6ec4" -SRC_URI[cargo-snapshot.md5sum] = "59bc24d15c393de364dadb3f4e3c9a5a" -SRC_URI[cargo-snapshot.sha256sum] = "0e052514ee88f236153a0d6c6f38f66d691eb4cf1ac09e6040d96e5101d57800" diff --git a/recipes-devtools/rust/rust-source-1.15.1.inc b/recipes-devtools/rust/rust-source-1.15.1.inc deleted file mode 100644 index deae018..0000000 --- a/recipes-devtools/rust/rust-source-1.15.1.inc +++ /dev/null @@ -1,14 +0,0 @@ -# Specifics for Rust 1.15.1 - -SRC_URI += "\ - https://static.rust-lang.org/dist/rustc-${PV}-src.tar.gz;name=rust \ - " -SRC_URI[rust.md5sum] = "5bbfff5ef8857a73d120616546a7fd29" -SRC_URI[rust.sha256sum] = "2e7daad418a830b45b977cd7ecf181b65f30f73df63ff36e124ea5fe5d1af327" - -# 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=43e1f1fb9c0ee3af66693d8c4fecafa8" diff --git a/recipes-devtools/rust/rust_1.15.1.bb b/recipes-devtools/rust/rust_1.15.1.bb deleted file mode 100644 index c0feb61..0000000 --- a/recipes-devtools/rust/rust_1.15.1.bb +++ /dev/null @@ -1,30 +0,0 @@ -require rust.inc -require rust-source-${PV}.inc -require rust-snapshot-${PV}.inc - -SRC_URI += " \ - file://rust-${PV}/0003-std-thread_local-workaround-for-NULL-__dso_handle.patch \ - " - -# These are extracted from rustc/src/bootstrap/Cargo.toml. -SRC_URI += " \ - crate://crates.io/cmake/0.1.18 \ - crate://crates.io/env_logger/0.3.5 \ - crate://crates.io/filetime/0.1.10 \ - crate://crates.io/gcc/0.3.40 \ - crate://crates.io/getopts/0.2.14 \ - crate://crates.io/libc/0.2.17 \ - crate://crates.io/log/0.3.6 \ - crate://crates.io/num_cpus/0.2.13 \ - crate://crates.io/rustc-serialize/0.3.19 \ - crate://crates.io/toml/0.1.30 \ -" - -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"