Index: head/lang/rust-nightly/Makefile =================================================================== --- head/lang/rust-nightly/Makefile (revision 488499) +++ head/lang/rust-nightly/Makefile (revision 488500) @@ -1,35 +1,35 @@ # Created by: Jean-Sébastien Pédron # $FreeBSD$ PORTVERSION= 1.33.0.${NIGHTLY_DATE:C,-,,g} PKGNAMESUFFIX= -nightly DISTNAME= rustc-nightly-src MASTERDIR= ${.CURDIR}/../rust PATCHDIR= ${.CURDIR}/files DISTINFO_FILE= ${.CURDIR}/distinfo 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 BOOTSTRAPS_DATE= 2018-12-09 RUST_BOOTSTRAP_VERSION= beta CARGO_BOOTSTRAP_VERSION= beta CARGO_VENDOR_DIR= ${WRKSRC}/vendor # Other bootstraps aren't provided by upstream yet ONLY_FOR_ARCHS= amd64 i386 post-patch: nightly-post-patch nightly-post-patch: # Work around unused_unsafe errors in libcore with stage0 @${REINPLACE_CMD} '/RUSTC_DENY_WARNINGS/d' ${WRKSRC}/src/bootstrap/builder.rs .include "${MASTERDIR}/Makefile" Index: head/lang/rust-nightly/distinfo =================================================================== --- head/lang/rust-nightly/distinfo (revision 488499) +++ head/lang/rust-nightly/distinfo (revision 488500) @@ -1,15 +1,15 @@ -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 SIZE (rust/2018-12-09/rust-std-beta-x86_64-unknown-freebsd.tar.gz) = 67038294 SHA256 (rust/2018-12-09/cargo-beta-x86_64-unknown-freebsd.tar.gz) = 054d227205949638483fc13035c0657177ebe0e48da24b77f406c86b35aef0a0 SIZE (rust/2018-12-09/cargo-beta-x86_64-unknown-freebsd.tar.gz) = 6256857 SHA256 (rust/2018-12-09/rustc-beta-i686-unknown-freebsd.tar.gz) = e01e810b8aa0e985d78918cc8934796b6c440e5bb87fd969c4ad074106492cea SIZE (rust/2018-12-09/rustc-beta-i686-unknown-freebsd.tar.gz) = 71112245 SHA256 (rust/2018-12-09/rust-std-beta-i686-unknown-freebsd.tar.gz) = 869efa046038c4bebec34cc04f1187fbae70dda9294effccce31510a3365b775 SIZE (rust/2018-12-09/rust-std-beta-i686-unknown-freebsd.tar.gz) = 67329498 SHA256 (rust/2018-12-09/cargo-beta-i686-unknown-freebsd.tar.gz) = dcf240699f5a00a97350a8cb47653da2633e33deb9ad4e85a979c81ab2e59072 SIZE (rust/2018-12-09/cargo-beta-i686-unknown-freebsd.tar.gz) = 6020090 Index: head/lang/rust-nightly/files/patch-src_libbacktrace_fileline.c =================================================================== --- head/lang/rust-nightly/files/patch-src_libbacktrace_fileline.c (revision 488499) +++ head/lang/rust-nightly/files/patch-src_libbacktrace_fileline.c (nonexistent) @@ -1,42 +0,0 @@ ---- src/libbacktrace/fileline.c.orig 2017-06-06 00:42:59 UTC -+++ src/libbacktrace/fileline.c -@@ -38,8 +38,39 @@ POSSIBILITY OF SUCH DAMAGE. */ - #include - #include - -+#if defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) -+#include -+#include -+#endif -+ - #include "backtrace.h" - #include "internal.h" -+ -+#if !defined(HAVE_GETEXECNAME) && defined(KERN_PROC_PATHNAME) -+/* Return pathname of executable or 0 on failure. */ -+#define HAVE_GETEXECNAME -+static char execname[PATH_MAX + 1]; -+static const char * -+getexecname(void) -+{ -+ size_t path_len = sizeof(execname); -+ int mib[] = { -+ CTL_KERN, -+#if defined(__NetBSD__) -+ KERN_PROC_ARGS, -+ -1, -+ KERN_PROC_PATHNAME, -+#else -+ KERN_PROC, -+ KERN_PROC_PATHNAME, -+ -1, -+#endif -+ }; -+ u_int miblen = sizeof(mib) / sizeof(mib[0]); -+ int rc = sysctl(mib, miblen, execname, &path_len, NULL, 0); -+ return rc ? NULL : execname; -+} -+#endif /* !HAVE_GETEXECNAME && KERN_PROC_PATHNAME */ - - #ifndef HAVE_GETEXECNAME - #define getexecname() NULL Property changes on: head/lang/rust-nightly/files/patch-src_libbacktrace_fileline.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/lang/rust-nightly/files/patch-src_libstd_build.rs =================================================================== --- head/lang/rust-nightly/files/patch-src_libstd_build.rs (revision 488499) +++ head/lang/rust-nightly/files/patch-src_libstd_build.rs (nonexistent) @@ -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"); Property changes on: head/lang/rust-nightly/files/patch-src_libstd_build.rs ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/lang/rust-nightly/files/patch-vendor_backtrace-sys_src_libbacktrace_fileline.c =================================================================== --- head/lang/rust-nightly/files/patch-vendor_backtrace-sys_src_libbacktrace_fileline.c (nonexistent) +++ head/lang/rust-nightly/files/patch-vendor_backtrace-sys_src_libbacktrace_fileline.c (revision 488500) @@ -0,0 +1,42 @@ +--- 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 + #include + ++#if defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) ++#include ++#include ++#endif ++ + #include "backtrace.h" + #include "internal.h" ++ ++#if !defined(HAVE_GETEXECNAME) && defined(KERN_PROC_PATHNAME) ++/* Return pathname of executable or 0 on failure. */ ++#define HAVE_GETEXECNAME ++static char execname[PATH_MAX + 1]; ++static const char * ++getexecname(void) ++{ ++ size_t path_len = sizeof(execname); ++ int mib[] = { ++ CTL_KERN, ++#if defined(__NetBSD__) ++ KERN_PROC_ARGS, ++ -1, ++ KERN_PROC_PATHNAME, ++#else ++ KERN_PROC, ++ KERN_PROC_PATHNAME, ++ -1, ++#endif ++ }; ++ u_int miblen = sizeof(mib) / sizeof(mib[0]); ++ int rc = sysctl(mib, miblen, execname, &path_len, NULL, 0); ++ return rc ? NULL : execname; ++} ++#endif /* !HAVE_GETEXECNAME && KERN_PROC_PATHNAME */ + + #ifndef HAVE_GETEXECNAME + #define getexecname() NULL Property changes on: head/lang/rust-nightly/files/patch-vendor_backtrace-sys_src_libbacktrace_fileline.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property