From e4dc8e7d529179185170ca1be42292aeb292db88 Mon Sep 17 00:00:00 2001 From: DPorts Builder Date: Mon, 10 Jul 2017 18:21:25 -0700 Subject: [PATCH] manually revert recent rust+cargo changes --- devel/cargo/distinfo | 4 ++-- lang/rust/Makefile.DragonFly | 4 ---- lang/rust/distinfo | 12 ++++++------ ...liblibc_src_unix_bsd_freebsdlike_dragonfly_mod.rs | 11 +++++++++++ 4 files changed, 19 insertions(+), 12 deletions(-) create mode 100644 lang/rust/dragonfly/patch-src_liblibc_src_unix_bsd_freebsdlike_dragonfly_mod.rs diff --git a/devel/cargo/distinfo b/devel/cargo/distinfo index 0266c85b498..3caf2ce5bc1 100644 --- a/devel/cargo/distinfo +++ b/devel/cargo/distinfo @@ -11,5 +11,5 @@ SHA256 (rust/rust-lang-cargo-0.19.0_GH0.tar.gz) = 9ea59d17a7fa81aa4bdefa2bb45a53 SIZE (rust/rust-lang-cargo-0.19.0_GH0.tar.gz) = 652163 SHA256 (rust/rust-lang-rust-installer-4f99485_GH0.tar.gz) = daa34a28d8fe64dd358e5a0c3a83b7018da6df41c9b4420d28ffdb8b05a82478 SIZE (rust/rust-lang-rust-installer-4f99485_GH0.tar.gz) = 19990 -SHA256 (rust/2017-04-27/cargo-0.18.0-x86_64-unknown-dragonfly.tar.gz) = 2f31cc9f76e0eb1aa7f44b61ce792902deca49f1d45cdede9313f654d699e3e1 -SIZE (rust/2017-04-27/cargo-0.18.0-x86_64-unknown-dragonfly.tar.gz) = 4858151 +SHA256 (rust/2017-04-27/cargo-0.18.0-x86_64-unknown-dragonfly.tar.gz) = 6a4d85ca24a791c24f8687ae4155551d0a1c9445f661e985d4645b3ae9e595e7 +SIZE (rust/2017-04-27/cargo-0.18.0-x86_64-unknown-dragonfly.tar.gz) = 4945570 diff --git a/lang/rust/Makefile.DragonFly b/lang/rust/Makefile.DragonFly index c1ace80cff9..8a9f8114934 100644 --- a/lang/rust/Makefile.DragonFly +++ b/lang/rust/Makefile.DragonFly @@ -5,7 +5,3 @@ MASTER_SITES+= https://leaf.dragonflybsd.org/~mneumann/rust/:rust_bootstrap \ MAKE_ENV="LD_LIBRARY_PATH=${WRKSRC}/build/${RUST_TARGET}/stage0/lib" MAKE_ENV+=RUST_BACKTRACE=1 - -.if ${DFLYVERSION} >= 400905 -EXTRA_PATCHES+= extra-patch-src_liblibc_src_unix_bsd_freebsdlike_dragonfly_mod.rs -.endif diff --git a/lang/rust/distinfo b/lang/rust/distinfo index fe0ecaf61be..e46f432bceb 100644 --- a/lang/rust/distinfo +++ b/lang/rust/distinfo @@ -21,9 +21,9 @@ SHA256 (rust/2017-04-24/cargo-0.18.0-aarch64-unknown-freebsd.tar.gz) = 8cdbf046b SIZE (rust/2017-04-24/cargo-0.18.0-aarch64-unknown-freebsd.tar.gz) = 2935624 SHA256 (rust/rust-registry-1.18.0.tar.xz) = 86c74c61aec5b94c9db9f569e6aa5cfeab2dde2a4ba73ea1da4c7320b31f5b36 SIZE (rust/rust-registry-1.18.0.tar.xz) = 7714840 -SHA256 (rust/2017-04-27/rustc-1.17.0-x86_64-unknown-dragonfly.tar.gz) = 8d879c3c0e805e0fe34a8205d6fee99e1d656bed96dfcc70598ff46f920fc261 -SIZE (rust/2017-04-27/rustc-1.17.0-x86_64-unknown-dragonfly.tar.gz) = 38329043 -SHA256 (rust/2017-04-27/rust-std-1.17.0-x86_64-unknown-dragonfly.tar.gz) = a7ad69adde35d99b57e05a84f2292f3b4d3e492ab4cf445906b2d8792335b085 -SIZE = (rust/2017-04-27/rust-std-1.17.0-x86_64-unknown-dragonfly.tar.gz) = 52536632 -SHA256 (rust/2017-04-27/cargo-0.18.0-x86_64-unknown-dragonfly.tar.gz) = 2f31cc9f76e0eb1aa7f44b61ce792902deca49f1d45cdede9313f654d699e3e1 -SIZE (rust/2017-04-27/cargo-0.18.0-x86_64-unknown-dragonfly.tar.gz) = 4858151 +SHA256 (rust/2017-04-27/rustc-1.17.0-x86_64-unknown-dragonfly.tar.gz) = a7f22cb60b2e440c4bdf4ef3988527b9b27ce95d978e7d792c162218ba70a51e +SIZE (rust/2017-04-27/rustc-1.17.0-x86_64-unknown-dragonfly.tar.gz) = 43359305 +SHA256 (rust/2017-04-27/rust-std-1.17.0-x86_64-unknown-dragonfly.tar.gz) = 70685efdd1181be946919de8173f530f4202c2f2fcae8b71971ec872f8c1e226 +SIZE = (rust/2017-04-27/rust-std-1.17.0-x86_64-unknown-dragonfly.tar.gz) = 57572645 +SHA256 (rust/2017-04-27/cargo-0.18.0-x86_64-unknown-dragonfly.tar.gz) = 6a4d85ca24a791c24f8687ae4155551d0a1c9445f661e985d4645b3ae9e595e7 +SIZE (rust/2017-04-27/cargo-0.18.0-x86_64-unknown-dragonfly.tar.gz) = 4945570 diff --git a/lang/rust/dragonfly/patch-src_liblibc_src_unix_bsd_freebsdlike_dragonfly_mod.rs b/lang/rust/dragonfly/patch-src_liblibc_src_unix_bsd_freebsdlike_dragonfly_mod.rs new file mode 100644 index 00000000000..10638b43292 --- /dev/null +++ b/lang/rust/dragonfly/patch-src_liblibc_src_unix_bsd_freebsdlike_dragonfly_mod.rs @@ -0,0 +1,11 @@ +--- src/liblibc/src/unix/bsd/freebsdlike/dragonfly/mod.rs.orig 2017-07-04 07:41:43 UTC ++++ src/liblibc/src/unix/bsd/freebsdlike/dragonfly/mod.rs +@@ -134,7 +134,7 @@ s! { + } + + pub const RAND_MAX: ::c_int = 0x7fff_ffff; +-pub const PTHREAD_STACK_MIN: ::size_t = 1024; ++pub const PTHREAD_STACK_MIN: ::size_t = 16384; + pub const SIGSTKSZ: ::size_t = 40960; + pub const MADV_INVAL: ::c_int = 10; + pub const O_CLOEXEC: ::c_int = 0x00020000; -- 2.41.0