diff --git a/srcpkgs/parallel-rust/patches/c5a0df810acae4ca04bc4c0291e9f0f00309c828.patch b/srcpkgs/parallel-rust/patches/c5a0df810acae4ca04bc4c0291e9f0f00309c828.patch new file mode 100644 index 00000000000..f2a8f7a8267 --- /dev/null +++ b/srcpkgs/parallel-rust/patches/c5a0df810acae4ca04bc4c0291e9f0f00309c828.patch @@ -0,0 +1,241 @@ +From 04d2ac0b22851059ebeb476b953159faaf87c769 Mon Sep 17 00:00:00 2001 +From: Igor Gnatenko +Date: Mon, 4 Dec 2017 01:16:52 +0100 +Subject: [PATCH 1/3] bump arrayvec to 0.4 + +Signed-off-by: Igor Gnatenko +--- + Cargo.lock | 46 ++++++++++++++++++---------------------------- + Cargo.toml | 2 +- + 2 files changed, 19 insertions(+), 29 deletions(-) + +diff --git a/Cargo.lock b/Cargo.lock +index c01308d..ab76676 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -1,25 +1,9 @@ +-[root] +-name = "parallel" +-version = "0.11.2" +-dependencies = [ +- "arrayvec 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)", +- "itoa 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "num_cpus 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "numtoa 0.0.7 (registry+https://github.com/rust-lang/crates.io-index)", +- "permutate 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "smallvec 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "sys-info 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "time 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)", +- "wait-timeout 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", +-] +- + [[package]] + name = "arrayvec" +-version = "0.3.23" ++version = "0.4.6" + source = "registry+https://github.com/rust-lang/crates.io-index" + dependencies = [ +- "nodrop 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", +- "odds 0.2.25 (registry+https://github.com/rust-lang/crates.io-index)", ++ "nodrop 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", + ] + + [[package]] +@@ -48,11 +32,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + + [[package]] + name = "nodrop" +-version = "0.1.9" ++version = "0.1.12" + source = "registry+https://github.com/rust-lang/crates.io-index" +-dependencies = [ +- "odds 0.2.25 (registry+https://github.com/rust-lang/crates.io-index)", +-] + + [[package]] + name = "num_cpus" +@@ -68,9 +49,19 @@ version = "0.0.7" + source = "registry+https://github.com/rust-lang/crates.io-index" + + [[package]] +-name = "odds" +-version = "0.2.25" +-source = "registry+https://github.com/rust-lang/crates.io-index" ++name = "parallel" ++version = "0.11.3" ++dependencies = [ ++ "arrayvec 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "itoa 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num_cpus 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "numtoa 0.0.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "permutate 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "smallvec 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "sys-info 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "time 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wait-timeout 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++] + + [[package]] + name = "permutate" +@@ -125,15 +116,14 @@ version = "0.1.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + + [metadata] +-"checksum arrayvec 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)" = "699e63a93b79d717e8c3b5eb1b28b7780d0d6d9e59a72eb769291c83b0c8dc67" ++"checksum arrayvec 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2f0ef4a9820019a0c91d918918c93dc71d469f581a49b47ddc1d285d4270bbe2" + "checksum gcc 0.3.50 (registry+https://github.com/rust-lang/crates.io-index)" = "5f837c392f2ea61cb1576eac188653df828c861b7137d74ea4a5caa89621f9e6" + "checksum itoa 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "eb2f404fbc66fd9aac13e998248505e7ecb2ad8e44ab6388684c5fb11c6c251c" + "checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" + "checksum libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)" = "e7eb6b826bfc1fdea7935d46556250d1799b7fe2d9f7951071f4291710665e3e" +-"checksum nodrop 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "52cd74cd09beba596430cc6e3091b74007169a56246e1262f0ba451ea95117b2" ++"checksum nodrop 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "9a2228dca57108069a5262f2ed8bd2e82496d2e074a06d1ccc7ce1687b6ae0a2" + "checksum num_cpus 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6e416ba127a4bb3ff398cb19546a8d0414f73352efe2857f4060d36f5fe5983a" + "checksum numtoa 0.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "5c8fcb09df1eba2d128cfc50bdb0c3f33ac4f91fdacc2d3ac039b3b192398f8f" +-"checksum odds 0.2.25 (registry+https://github.com/rust-lang/crates.io-index)" = "c3df9b730298cea3a1c3faa90b7e2f9df3a9c400d0936d6015e6165734eefcba" + "checksum permutate 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "53b7d5b19a715ffab38693a9dd44b067fdfa2b18eef65bd93562dfe507022fae" + "checksum redox_syscall 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)" = "3041aeb6000db123d2c9c751433f526e1f404b23213bd733167ab770c3989b4d" + "checksum smallvec 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2e40af10aafe98b4d8294ae8388d8a5cd0707c65d364872efe72d063ec44bee0" +diff --git a/Cargo.toml b/Cargo.toml +index ee5d106..c526834 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -14,7 +14,7 @@ itoa = "0.3" + numtoa = "0.0" + num_cpus = "1.5" + permutate = "0.3" +-arrayvec = "0.3" ++arrayvec = "0.4" + time = "0.1" + smallvec = "0.4" + sys-info = "0.4" + +From 04e954d1adc3f8364f0c5f8edd6418941e5d48d4 Mon Sep 17 00:00:00 2001 +From: Igor Gnatenko +Date: Mon, 4 Dec 2017 01:18:23 +0100 +Subject: [PATCH 2/3] bump smallvec to 0.6 + +Signed-off-by: Igor Gnatenko +--- + Cargo.lock | 6 +++--- + Cargo.toml | 2 +- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/Cargo.lock b/Cargo.lock +index ab76676..5161560 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -57,7 +57,7 @@ dependencies = [ + "num_cpus 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)", + "numtoa 0.0.7 (registry+https://github.com/rust-lang/crates.io-index)", + "permutate 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "smallvec 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "smallvec 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sys-info 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)", + "wait-timeout 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", +@@ -75,7 +75,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + + [[package]] + name = "smallvec" +-version = "0.4.0" ++version = "0.6.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + + [[package]] +@@ -126,7 +126,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + "checksum numtoa 0.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "5c8fcb09df1eba2d128cfc50bdb0c3f33ac4f91fdacc2d3ac039b3b192398f8f" + "checksum permutate 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "53b7d5b19a715ffab38693a9dd44b067fdfa2b18eef65bd93562dfe507022fae" + "checksum redox_syscall 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)" = "3041aeb6000db123d2c9c751433f526e1f404b23213bd733167ab770c3989b4d" +-"checksum smallvec 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2e40af10aafe98b4d8294ae8388d8a5cd0707c65d364872efe72d063ec44bee0" ++"checksum smallvec 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "44db0ecb22921ef790d17ae13a3f6d15784183ff5f2a01aa32098c7498d2b4b9" + "checksum sys-info 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "246f8bbb443ae0026c92266c26d997d04634c8b44c3baff9fa3bff445b40878c" + "checksum time 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)" = "ffd7ccbf969a892bf83f1e441126968a07a3941c24ff522a26af9f9f4585d1a3" + "checksum wait-timeout 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "b9f3bf741a801531993db6478b95682117471f76916f5e690dd8d45395b09349" +diff --git a/Cargo.toml b/Cargo.toml +index c526834..9c3047f 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -16,6 +16,6 @@ num_cpus = "1.5" + permutate = "0.3" + arrayvec = "0.4" + time = "0.1" +-smallvec = "0.4" ++smallvec = "0.6" + sys-info = "0.4" + wait-timeout = "0.1" + +From fb63f1e132675f7c634200ccb2f997231f7f6112 Mon Sep 17 00:00:00 2001 +From: Igor Gnatenko +Date: Mon, 4 Dec 2017 01:19:07 +0100 +Subject: [PATCH 3/3] bump sys-info to 0.5 + +Signed-off-by: Igor Gnatenko +--- + Cargo.lock | 12 ++++++------ + Cargo.toml | 2 +- + 2 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/Cargo.lock b/Cargo.lock +index 5161560..cbc91ec 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -8,7 +8,7 @@ dependencies = [ + + [[package]] + name = "gcc" +-version = "0.3.50" ++version = "0.3.54" + source = "registry+https://github.com/rust-lang/crates.io-index" + + [[package]] +@@ -58,7 +58,7 @@ dependencies = [ + "numtoa 0.0.7 (registry+https://github.com/rust-lang/crates.io-index)", + "permutate 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "smallvec 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "sys-info 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "sys-info 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)", + "wait-timeout 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + ] +@@ -80,10 +80,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + + [[package]] + name = "sys-info" +-version = "0.4.1" ++version = "0.5.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + dependencies = [ +- "gcc 0.3.50 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gcc 0.3.54 (registry+https://github.com/rust-lang/crates.io-index)", + ] + + [[package]] +@@ -117,7 +117,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + + [metadata] + "checksum arrayvec 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2f0ef4a9820019a0c91d918918c93dc71d469f581a49b47ddc1d285d4270bbe2" +-"checksum gcc 0.3.50 (registry+https://github.com/rust-lang/crates.io-index)" = "5f837c392f2ea61cb1576eac188653df828c861b7137d74ea4a5caa89621f9e6" ++"checksum gcc 0.3.54 (registry+https://github.com/rust-lang/crates.io-index)" = "5e33ec290da0d127825013597dbdfc28bee4964690c7ce1166cbc2a7bd08b1bb" + "checksum itoa 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "eb2f404fbc66fd9aac13e998248505e7ecb2ad8e44ab6388684c5fb11c6c251c" + "checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" + "checksum libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)" = "e7eb6b826bfc1fdea7935d46556250d1799b7fe2d9f7951071f4291710665e3e" +@@ -127,7 +127,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + "checksum permutate 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "53b7d5b19a715ffab38693a9dd44b067fdfa2b18eef65bd93562dfe507022fae" + "checksum redox_syscall 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)" = "3041aeb6000db123d2c9c751433f526e1f404b23213bd733167ab770c3989b4d" + "checksum smallvec 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "44db0ecb22921ef790d17ae13a3f6d15784183ff5f2a01aa32098c7498d2b4b9" +-"checksum sys-info 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "246f8bbb443ae0026c92266c26d997d04634c8b44c3baff9fa3bff445b40878c" ++"checksum sys-info 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f22142cf9c0a96da2db4db82df64fae9f220bd4226b6bd7d6a831c43b2c73a4e" + "checksum time 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)" = "ffd7ccbf969a892bf83f1e441126968a07a3941c24ff522a26af9f9f4585d1a3" + "checksum wait-timeout 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "b9f3bf741a801531993db6478b95682117471f76916f5e690dd8d45395b09349" + "checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" +diff --git a/Cargo.toml b/Cargo.toml +index 9c3047f..1785ecd 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -17,5 +17,5 @@ permutate = "0.3" + arrayvec = "0.4" + time = "0.1" + smallvec = "0.6" +-sys-info = "0.4" ++sys-info = "0.5" + wait-timeout = "0.1" diff --git a/srcpkgs/parallel-rust/template b/srcpkgs/parallel-rust/template index dc4f8cec01f..3cbc5dcdf99 100644 --- a/srcpkgs/parallel-rust/template +++ b/srcpkgs/parallel-rust/template @@ -1,22 +1,18 @@ # Template file for 'parallel-rust' pkgname=parallel-rust version=0.11.3 -revision=1 -wrksrc=parallel-${version} -hostmakedepends="cargo rust" +revision=2 +wrksrc="parallel-${version}" +patch_args="-Np1" +build_style=cargo short_desc="Inspired by GNU Parallel, a command-line CPU load balancer written in Rust" maintainer="lemmi " license="MIT" homepage="https://github.com/mmstick/parallel" distfiles="https://github.com/mmstick/parallel/archive/${version}.tar.gz" checksum=70f09dcbf6d34486e505f3e4a04d4f5e30081ec6cd71920017a8e8090eabc242 -nocross=yes #rist - -do_build() { - cargo build --release -} do_install() { vlicense LICENSE - vbin target/release/parallel parallel-rust + vbin target/${RUST_TARGET}/release/parallel parallel-rust }