diff options
| -rw-r--r-- | lang/rust-nightly/Makefile | 2 | ||||
| -rw-r--r-- | lang/rust-nightly/distinfo | 6 | ||||
| -rw-r--r-- | lang/rust-nightly/files/patch-src_libstd_build.rs | 22 | ||||
| -rw-r--r-- | lang/rust-nightly/files/patch-vendor_backtrace-sys_src_libbacktrace_fileline.c (renamed from lang/rust-nightly/files/patch-src_libbacktrace_fileline.c) | 4 |
4 files changed, 6 insertions, 28 deletions
diff --git a/lang/rust-nightly/Makefile b/lang/rust-nightly/Makefile index f1a9d15f5035..bdcaa05d24e6 100644 --- a/lang/rust-nightly/Makefile +++ b/lang/rust-nightly/Makefile @@ -14,7 +14,7 @@ CONFLICTS_INSTALL= rust # Which source to pull: # https://static.rust-lang.org/dist/${NIGHTLY_DATE}/rustc-nightly-src.tar.gz # https://static.rust-lang.org/dist/channel-rust-nightly.toml -NIGHTLY_DATE= 2018-12-25 +NIGHTLY_DATE= 2018-12-27 NIGHTLY_SUBDIR= ${NIGHTLY_DATE}/ # See WRKSRC/src/stage0.txt for this date diff --git a/lang/rust-nightly/distinfo b/lang/rust-nightly/distinfo index fb0ff6b8aacc..e254585c772a 100644 --- a/lang/rust-nightly/distinfo +++ b/lang/rust-nightly/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1545689751 -SHA256 (rust/2018-12-25/rustc-nightly-src.tar.xz) = 21bfb479c8a9f34f9183d4f5084c774045ee644fdaba0a4bcb6c4f32ecc3e2ee -SIZE (rust/2018-12-25/rustc-nightly-src.tar.xz) = 100421540 +TIMESTAMP = 1545859458 +SHA256 (rust/2018-12-27/rustc-nightly-src.tar.xz) = b20fc4f4fb0dd95b0be8666ce83efbbcf321ddeb017f09fe7b7710f1a23e79ef +SIZE (rust/2018-12-27/rustc-nightly-src.tar.xz) = 100348728 SHA256 (rust/2018-12-09/rustc-beta-x86_64-unknown-freebsd.tar.gz) = 1c59a13cc385c9e06b80202651f8af9e9e22658e1863de85ce67ca12a0940a46 SIZE (rust/2018-12-09/rustc-beta-x86_64-unknown-freebsd.tar.gz) = 70377440 SHA256 (rust/2018-12-09/rust-std-beta-x86_64-unknown-freebsd.tar.gz) = 12fa39ff525ddd64490e63be98b954c9ee66e0cf603143f49b04f1c5760f3885 diff --git a/lang/rust-nightly/files/patch-src_libstd_build.rs b/lang/rust-nightly/files/patch-src_libstd_build.rs deleted file mode 100644 index 89f1bf7b0221..000000000000 --- a/lang/rust-nightly/files/patch-src_libstd_build.rs +++ /dev/null @@ -1,22 +0,0 @@ ---- src/libstd/build.rs.orig 2018-09-03 18:29:12 UTC -+++ src/libstd/build.rs -@@ -94,13 +94,18 @@ fn build_libbacktrace(target: &str) -> Result<(), ()> - .out_dir(&native.out_dir) - .warnings(false) - .file("../libbacktrace/alloc.c") -- .file("../libbacktrace/backtrace.c") - .file("../libbacktrace/dwarf.c") - .file("../libbacktrace/fileline.c") - .file("../libbacktrace/posix.c") - .file("../libbacktrace/read.c") - .file("../libbacktrace/sort.c") - .file("../libbacktrace/state.c"); -+ -+ if target.contains("freebsd") { -+ build.file("../libbacktrace/nounwind.c"); -+ } else { -+ build.file("../libbacktrace/backtrace.c"); -+ } - - if target.contains("darwin") { - build.file("../libbacktrace/macho.c"); diff --git a/lang/rust-nightly/files/patch-src_libbacktrace_fileline.c b/lang/rust-nightly/files/patch-vendor_backtrace-sys_src_libbacktrace_fileline.c index 88e16025ddfc..162865a9fe10 100644 --- a/lang/rust-nightly/files/patch-src_libbacktrace_fileline.c +++ b/lang/rust-nightly/files/patch-vendor_backtrace-sys_src_libbacktrace_fileline.c @@ -1,5 +1,5 @@ ---- src/libbacktrace/fileline.c.orig 2017-06-06 00:42:59 UTC -+++ src/libbacktrace/fileline.c +--- vendor/backtrace-sys/src/libbacktrace/fileline.c.orig 2017-06-06 00:42:59 UTC ++++ vendor/backtrace-sys/src/libbacktrace/fileline.c @@ -38,8 +38,39 @@ POSSIBILITY OF SUCH DAMAGE. */ #include <fcntl.h> #include <stdlib.h> |