diff --git a/.gitignore b/.gitignore index 9f2aab9..6d1d446 100644 --- a/.gitignore +++ b/.gitignore @@ -94,3 +94,12 @@ /cargo-0.23.0-powerpc64-unknown-linux-gnu.tar.xz /cargo-0.23.0-s390x-unknown-linux-gnu.tar.xz /cargo-0.23.0-x86_64-unknown-linux-gnu.tar.xz +/cargo-0.25.0.tar.gz +/cargo-0.25.0-vendor.tar.xz +/cargo-0.24.0-aarch64-unknown-linux-gnu.tar.xz +/cargo-0.24.0-armv7-unknown-linux-gnueabihf.tar.xz +/cargo-0.24.0-i686-unknown-linux-gnu.tar.xz +/cargo-0.24.0-powerpc64le-unknown-linux-gnu.tar.xz +/cargo-0.24.0-powerpc64-unknown-linux-gnu.tar.xz +/cargo-0.24.0-s390x-unknown-linux-gnu.tar.xz +/cargo-0.24.0-x86_64-unknown-linux-gnu.tar.xz diff --git a/0001-Remove-test-that-requires-Emscripten.patch b/0001-Remove-test-that-requires-Emscripten.patch new file mode 100644 index 0000000..0795fb7 --- /dev/null +++ b/0001-Remove-test-that-requires-Emscripten.patch @@ -0,0 +1,128 @@ +From 5753e1c0361b09df9a3af9df15b50bfdda4f353d Mon Sep 17 00:00:00 2001 +From: Alex Crichton +Date: Wed, 24 Jan 2018 09:45:01 -0800 +Subject: [PATCH] Remove test that requires Emscripten + +This seems relatively unlikely to regress in the future and otherwise arranging +Cargo to have a rustc that has Emscripten support will become difficult in the +near future in the Rust repo. All in all it seems like the course of action to +take is to delete this test for now. +--- + tests/build.rs | 101 --------------------------------------------------------- + 1 file changed, 101 deletions(-) + +diff --git a/tests/build.rs b/tests/build.rs +index 1ca01cabffe9..14237e4c9b14 100644 +--- a/tests/build.rs ++++ b/tests/build.rs +@@ -3764,107 +3764,6 @@ fn cdylib_final_outputs() { + } + } + +-#[test] +-fn wasm32_final_outputs() { +- use cargo::core::{Shell, Target, Workspace}; +- use cargo::ops::{self, BuildConfig, Context, CompileMode, CompileOptions, Kind, Unit}; +- use cargo::util::Config; +- use cargo::util::important_paths::find_root_manifest_for_wd; +- +- let target_triple = "wasm32-unknown-emscripten"; +- +- let p = project("foo") +- .file("Cargo.toml", r#" +- [project] +- name = "foo-bar" +- authors = [] +- version = "0.1.0" +- "#) +- .file("src/main.rs", "fn main() {}") +- .build(); +- +- // We can't cross-compile the project to wasm target unless we have emscripten installed. +- // So here we will not run `cargo build`, but just create cargo_rustc::Context and ask it +- // what the target file names would be. +- +- // Create various stuff required to build cargo_rustc::Context. +- let shell = Shell::new(); +- let config = Config::new(shell, p.root(), p.root()); +- let root = find_root_manifest_for_wd(None, config.cwd()).expect("Can't find the root manifest"); +- let ws = Workspace::new(&root, &config).expect("Can't create workspace"); +- +- let opts = CompileOptions { +- target: Some(target_triple), +- .. CompileOptions::default(&config, CompileMode::Build) +- }; +- +- let specs = opts.spec.into_package_id_specs(&ws).expect("Can't create specs"); +- +- let (packages, resolve) = ops::resolve_ws_precisely( +- &ws, +- None, +- opts.features, +- opts.all_features, +- opts.no_default_features, +- &specs, +- ).expect("Can't create resolve"); +- +- let build_config = BuildConfig { +- requested_target: Some(target_triple.to_string()), +- jobs: 1, +- .. BuildConfig::default() +- }; +- +- let pkgid = packages +- .package_ids() +- .filter(|id| id.name() == "foo-bar") +- .collect::>(); +- let pkg = packages.get(pkgid[0]).expect("Can't get package"); +- +- let target = Target::bin_target("foo-bar", p.root().join("src/main.rs"), None); +- +- let unit = Unit { +- pkg: &pkg, +- target: &target, +- profile: &ws.profiles().dev, +- kind: Kind::Target, +- }; +- let units = vec![unit]; +- +- // Finally, create the cargo_rustc::Context. +- let mut ctx = Context::new( +- &ws, +- &resolve, +- &packages, +- &config, +- build_config, +- ws.profiles(), +- ).expect("Can't create context"); +- +- // Ask the context to resolve target file names. +- ctx.probe_target_info(&units).expect("Can't probe target info"); +- let target_filenames = ctx.target_filenames(&unit).expect("Can't get target file names"); +- +- // Verify the result. +- let mut expected = vec!["debug/foo-bar.js", "debug/foo_bar.wasm"]; +- +- assert_eq!(target_filenames.len(), expected.len()); +- +- let mut target_filenames = target_filenames +- .iter() +- .map(|&(_, ref link_dst, _)| link_dst.clone().unwrap()) +- .collect::>(); +- target_filenames.sort(); +- expected.sort(); +- +- for (expected, actual) in expected.iter().zip(target_filenames.iter()) { +- assert!( +- actual.ends_with(expected), +- format!("{:?} does not end with {}", actual, expected) +- ); +- } +-} +- + #[test] + fn deterministic_cfg_flags() { + // This bug is non-deterministic +-- +2.14.3 + diff --git a/cargo.spec b/cargo.spec index 7fbc7de..7da81ed 100644 --- a/cargo.spec +++ b/cargo.spec @@ -12,19 +12,20 @@ %endif Name: cargo -Version: 0.24.0 -Release: 3%{?dist} +Version: 0.25.0 +Release: 1%{?dist} Summary: Rust's package manager and build tool License: ASL 2.0 or MIT URL: https://crates.io/ ExclusiveArch: %{rust_arches} %global cargo_version %{version} -%global cargo_bootstrap 0.23.0 +%global cargo_bootstrap 0.24.0 Source0: https://github.com/rust-lang/%{name}/archive/%{cargo_version}/%{name}-%{cargo_version}.tar.gz Patch1: cargo-0.23.0-disable-mdbook.patch +Patch2: 0001-Remove-test-that-requires-Emscripten.patch # Get the Rust triple for any arch. %{lua: function rust_triple(arch) @@ -74,6 +75,7 @@ BuildRequires: rust BuildRequires: make BuildRequires: cmake BuildRequires: gcc +BuildRequires: git %ifarch %{bootstrap_arches} %global bootstrap_root cargo-%{cargo_bootstrap}-%{rust_triple} @@ -92,7 +94,7 @@ BuildRequires: zlib-devel BuildRequires: pkgconfig %if %with bundled_libgit2 -Provides: bundled(libgit2) = 0.25.0 +Provides: bundled(libgit2) = 0.26.0 %else BuildRequires: libgit2-devel >= 0.24 %endif @@ -127,6 +129,7 @@ test -f '%{local_cargo}' %setup -q -n %{name}-%{cargo_version} -T -D -a 100 %patch1 -p1 -b .mdbook +%patch2 -p1 -b .emscripten # fixed upstream in commit 64828ba9cab7 -> cargo ~0.26 chmod -x src/cargo/lib.rs @@ -215,6 +218,9 @@ CFG_DISABLE_CROSS_TESTS=1 %{local_cargo} test --no-fail-fast || : %changelog +* Wed Feb 21 2018 Josh Stone - 0.25.0-1 +- Update to 0.25.0. + * Wed Feb 07 2018 Josh Stone - 0.24.0-3 - FTBFS: fix a misidentified shebang diff --git a/sources b/sources index 0206b4d..666385e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (cargo-0.24.0.tar.gz) = d0aa41f113c8ed40a96a279d986894bdb8756ff49f7f8c7a269033e1000b110a2b867283bac2e85edab54b52bf8c78f9048481762a8c9e3e02a956cac95ddbb7 -SHA512 (cargo-0.24.0-vendor.tar.xz) = 60c12ce49a53cf986490f5a5fdf606f0374677902edfdc4d48ab1ba6094f3f23efc59626cd3776649c9386a9cab2a60332e5693aad6acbcbb92132efdcf9fe21 +SHA512 (cargo-0.25.0.tar.gz) = 959277eaf993b455ced93581dd04358507d91390dbc4413ca5e30f5548221e8d321b8983c195025b73a193107410429b33b9692298733c201c98ab62da99dfad +SHA512 (cargo-0.25.0-vendor.tar.xz) = 301fdf0ceea482120fbf4b5037bc2dfe18cd3c39f42eaca4464ed1f356093f0f9fb3dae48d1fd72b964fd5f4c6be21fa79e548d0480a1834afe55c2d4e50bac7 diff --git a/sources-bootstrap b/sources-bootstrap index 15fe5fd..9ef30fd 100644 --- a/sources-bootstrap +++ b/sources-bootstrap @@ -1,9 +1,9 @@ -SHA512 (cargo-0.24.0.tar.gz) = d0aa41f113c8ed40a96a279d986894bdb8756ff49f7f8c7a269033e1000b110a2b867283bac2e85edab54b52bf8c78f9048481762a8c9e3e02a956cac95ddbb7 -SHA512 (cargo-0.24.0-vendor.tar.xz) = 60c12ce49a53cf986490f5a5fdf606f0374677902edfdc4d48ab1ba6094f3f23efc59626cd3776649c9386a9cab2a60332e5693aad6acbcbb92132efdcf9fe21 -SHA512 (cargo-0.23.0-aarch64-unknown-linux-gnu.tar.xz) = c23e2eee94d0c78e840549bc528ed9aafdf34569845bdecbeb3d3722437f5cb1fd7dfd6991e7a7a46f0b0be7c350874fc25dd922dd3a6081161d75afe1056b9f -SHA512 (cargo-0.23.0-armv7-unknown-linux-gnueabihf.tar.xz) = 25a261701073d9dd629b9d0fd642b893cb226054d97a78011ee6426f001964827cddabe975eba2c11fd649843c069b2a6546d2c0658ae3244b870c8e197c5594 -SHA512 (cargo-0.23.0-i686-unknown-linux-gnu.tar.xz) = feb145216f6ce04df46939a926ce1f62f15bba6b7259c454abf12aa0e3dc62b5870ddd1bd213b293d5495e40846f61d6f04cee51b08d535b12921fbd51d0baac -SHA512 (cargo-0.23.0-powerpc64le-unknown-linux-gnu.tar.xz) = 0965084bd9d67c80c5f78aef9bff725758ad3fc81ec1e11ff9491fd64112a71fb4bd94a491def168980ce3bc8b8904e22eed73b61a7bc4a25ea38afd4af587cf -SHA512 (cargo-0.23.0-powerpc64-unknown-linux-gnu.tar.xz) = e055acc991dfdee38b29d7ca41fd83d9cd9b58fc9f73198314cae406eed360ce697acf459615bfab94e40ab07e46f4d07965d4cf8f361bd115e68af1626fc37a -SHA512 (cargo-0.23.0-s390x-unknown-linux-gnu.tar.xz) = 014c404dc7790cf82b9d923b46f222fc68183bd1561cc62f0a34290a855e08bb21075ea1a908f5aa26b5cea160a828b775cbe7ba17e0a33ca2bd35e26d6ecf11 -SHA512 (cargo-0.23.0-x86_64-unknown-linux-gnu.tar.xz) = 0399f03ffe3c74ee4854bd7e0b81d1bae0a281f8a4cc29238bbcb9ad9c43aa8bcee6e4cb633c0478a70914d5b01186d163fa9c0473c1fd886c22e1b93a621f98 +SHA512 (cargo-0.25.0.tar.gz) = 959277eaf993b455ced93581dd04358507d91390dbc4413ca5e30f5548221e8d321b8983c195025b73a193107410429b33b9692298733c201c98ab62da99dfad +SHA512 (cargo-0.25.0-vendor.tar.xz) = 301fdf0ceea482120fbf4b5037bc2dfe18cd3c39f42eaca4464ed1f356093f0f9fb3dae48d1fd72b964fd5f4c6be21fa79e548d0480a1834afe55c2d4e50bac7 +SHA512 (cargo-0.24.0-aarch64-unknown-linux-gnu.tar.xz) = 315bad7c5b26120205514cae0d76e54160289cbbb2dd2161b7bc5879fe58633cd0fcf1ab7c92192541b971e98424496dd178ae6138e943e03f3193fc1eba9b20 +SHA512 (cargo-0.24.0-armv7-unknown-linux-gnueabihf.tar.xz) = 359e4d969979f0e228ff58072f316039b9e7b6293a2bfbd66a6d31c19a8ab3d4e4c225e4052b133c52bfd64bc43adfe511146d5e8b5b93271aaa47291be5bf02 +SHA512 (cargo-0.24.0-i686-unknown-linux-gnu.tar.xz) = d965a7eaff404db4ffdbd245d45ca37d5a2e0c2cfde7c504af85b728e5658dce7134ce6d52d140e7dfd73c459667feccbfd8342294a2b37c0c6ce94d0d819504 +SHA512 (cargo-0.24.0-powerpc64le-unknown-linux-gnu.tar.xz) = d16f9503cbdd53b07337d684c9c656ac2e87e825bc891a04872bbd86f74fdc526e13ce2dd4796e48105a0df055b4e289058aa502a343fb230e4df24e72ec30ba +SHA512 (cargo-0.24.0-powerpc64-unknown-linux-gnu.tar.xz) = aad0c41aa6ba9896aa366e6c2a729ba2cf15d7ea4faab26bd1e709e119203729c1c499ae85e407840f71372d13c0cba589de18126117af8dddb1a0212dc422c6 +SHA512 (cargo-0.24.0-s390x-unknown-linux-gnu.tar.xz) = b1d68842dd75b8d11a575e06cc27d4feff461110707c0d466c6beac850455d8addabc79f796cd3143f1b5ba874c2ef485ddf98f716ea254c2809d273af20f4ad +SHA512 (cargo-0.24.0-x86_64-unknown-linux-gnu.tar.xz) = d007060d67325edd5f2d638a5cea9c5153ef53f1ebff9340ebbfe7550898957bb0d0effa7e39851224f122b4211fcf3e8d9e556c7e173ded6552f433b3e3ca2b