Index: head/lang/rust-nightly/Makefile =================================================================== --- head/lang/rust-nightly/Makefile (revision 529274) +++ head/lang/rust-nightly/Makefile (revision 529275) @@ -1,33 +1,33 @@ # Created by: Jean-Sébastien Pédron # $FreeBSD$ PORTVERSION= 1.44.0.${NIGHTLY_DATE:C,-,,g} # Always set PORTREVISION explicitly as otherwise it is inherited from lang/rust PORTREVISION= 0 PKGNAMESUFFIX= -nightly DISTNAME= rustc-nightly-src ONLY_FOR_ARCHS= amd64 i386 ONLY_FOR_ARCHS_REASON= upstream does not provide bootstraps for other architectures CONFLICTS_INSTALL= rust MASTERDIR= ${.CURDIR}/../rust PATCHDIR= ${.CURDIR}/files DISTINFO_FILE= ${.CURDIR}/distinfo # Get latest from top level 'date' key in # https://static.rust-lang.org/dist/channel-rust-nightly.toml -NIGHTLY_DATE= 2020-03-19 +NIGHTLY_DATE= 2020-03-27 # See WRKSRC/src/stage0.txt for this date BOOTSTRAPS_DATE= 2020-03-12 RUST_BOOTSTRAP_VERSION= beta CARGO_BOOTSTRAP_VERSION= beta post-configure: # Don't abort if optional tools fail to build # https://github.com/rust-lang/rust/commit/53254a888b42 @${ECHO_CMD} 'missing-tools = true' >>${WRKSRC}/config.toml .include "${MASTERDIR}/Makefile" Index: head/lang/rust-nightly/distinfo =================================================================== --- head/lang/rust-nightly/distinfo (revision 529274) +++ head/lang/rust-nightly/distinfo (revision 529275) @@ -1,15 +1,15 @@ -TIMESTAMP = 1584596918 -SHA256 (rust/2020-03-19/rustc-nightly-src.tar.xz) = 0e46f941665db698e0162c362e1027b0b87b3cc5516278e224558d42a5919020 -SIZE (rust/2020-03-19/rustc-nightly-src.tar.xz) = 94422736 +TIMESTAMP = 1585320978 +SHA256 (rust/2020-03-27/rustc-nightly-src.tar.xz) = 0d8126c55fa273dc1803800cdff5e97c687587e4f0a9e2560c8a0e2f6b188c5c +SIZE (rust/2020-03-27/rustc-nightly-src.tar.xz) = 94507728 SHA256 (rust/2020-03-12/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 8a1fa4555d128dcf89958f7ea5ff476408903e76ea2f6c97f3da6d131b0c040f SIZE (rust/2020-03-12/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 35928800 SHA256 (rust/2020-03-12/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = d1faf86633140c059ee6f6d7ba7ae3f637385a8a78b98a97f6084d001497d650 SIZE (rust/2020-03-12/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = 16793056 SHA256 (rust/2020-03-12/cargo-beta-x86_64-unknown-freebsd.tar.xz) = 92fad696c7441c2ae31b6d722f0e55e1462d30310a5ce1c4008d88a3b8461ab6 SIZE (rust/2020-03-12/cargo-beta-x86_64-unknown-freebsd.tar.xz) = 5128712 SHA256 (rust/2020-03-12/rustc-beta-i686-unknown-freebsd.tar.xz) = 160c0927858f5e702a3da2b0a3e5d9a02384fe892c9e0304429edb8ebe5518a8 SIZE (rust/2020-03-12/rustc-beta-i686-unknown-freebsd.tar.xz) = 37223092 SHA256 (rust/2020-03-12/rust-std-beta-i686-unknown-freebsd.tar.xz) = 33e82095a7dcde03249084295dcd47daedfdd44d884ad71c7960c7553136cfc6 SIZE (rust/2020-03-12/rust-std-beta-i686-unknown-freebsd.tar.xz) = 16790808 SHA256 (rust/2020-03-12/cargo-beta-i686-unknown-freebsd.tar.xz) = 0c2cde352e4a384100d71fa99f3d872ab5a955320ff57b5eac6d152d7d87a6e5 SIZE (rust/2020-03-12/cargo-beta-i686-unknown-freebsd.tar.xz) = 5033880 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 (revision 529274) +++ head/lang/rust-nightly/files/patch-vendor_backtrace-sys_src_libbacktrace_fileline.c (nonexistent) @@ -1,117 +0,0 @@ -https://github.com/ianlancetaylor/libbacktrace/commit/0f06cda953cc4e26f38751c5b9f15ae8dfa5ff2d -https://github.com/rust-lang-nursery/libbacktrace/pull/1 - ---- vendor/backtrace-sys/src/libbacktrace/fileline.c.orig 2020-02-19 21:11:31 UTC -+++ vendor/backtrace-sys/src/libbacktrace/fileline.c -@@ -39,6 +39,10 @@ POSSIBILITY OF SUCH DAMAGE. */ - #include - #include - -+#if defined (HAVE_KERN_PROC_ARGS) || defined (HAVE_KERN_PROC) -+#include -+#endif -+ - #include "backtrace.h" - #include "internal.h" - -@@ -46,6 +50,78 @@ POSSIBILITY OF SUCH DAMAGE. */ - #define getexecname() NULL - #endif - -+#if !defined (HAVE_KERN_PROC_ARGS) && !defined (HAVE_KERN_PROC) -+ -+#define sysctl_exec_name1(state, error_callback, data) NULL -+#define sysctl_exec_name2(state, error_callback, data) NULL -+ -+#else /* defined (HAVE_KERN_PROC_ARGS) || |defined (HAVE_KERN_PROC) */ -+ -+static char * -+sysctl_exec_name (struct backtrace_state *state, -+ int mib0, int mib1, int mib2, int mib3, -+ backtrace_error_callback error_callback, void *data) -+{ -+ int mib[4]; -+ size_t len; -+ char *name; -+ size_t rlen; -+ -+ mib[0] = mib0; -+ mib[1] = mib1; -+ mib[2] = mib2; -+ mib[3] = mib3; -+ -+ if (sysctl (mib, 4, NULL, &len, NULL, 0) < 0) -+ return NULL; -+ name = (char *) backtrace_alloc (state, len, error_callback, data); -+ if (name == NULL) -+ return NULL; -+ rlen = len; -+ if (sysctl (mib, 4, name, &rlen, NULL, 0) < 0) -+ { -+ backtrace_free (state, name, len, error_callback, data); -+ return NULL; -+ } -+ return name; -+} -+ -+#ifdef HAVE_KERN_PROC_ARGS -+ -+static char * -+sysctl_exec_name1 (struct backtrace_state *state, -+ backtrace_error_callback error_callback, void *data) -+{ -+ /* This variant is used on NetBSD. */ -+ return sysctl_exec_name (state, CTL_KERN, KERN_PROC_ARGS, -1, -+ KERN_PROC_PATHNAME, error_callback, data); -+} -+ -+#else -+ -+#define sysctl_exec_name1(state, error_callback, data) NULL -+ -+#endif -+ -+#ifdef HAVE_KERN_PROC -+ -+static char * -+sysctl_exec_name2 (struct backtrace_state *state, -+ backtrace_error_callback error_callback, void *data) -+{ -+ /* This variant is used on FreeBSD. */ -+ return sysctl_exec_name (state, CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1, -+ error_callback, data); -+} -+ -+#else -+ -+#define sysctl_exec_name2(state, error_callback, data) NULL -+ -+#endif -+ -+#endif /* defined (HAVE_KERN_PROC_ARGS) || |defined (HAVE_KERN_PROC) */ -+ - /* Initialize the fileline information from the executable. Returns 1 - on success, 0 on failure. */ - -@@ -83,7 +159,7 @@ fileline_initialize (struct backtrace_state *state, - - descriptor = -1; - called_error_callback = 0; -- for (pass = 0; pass < 5; ++pass) -+ for (pass = 0; pass < 7; ++pass) - { - int does_not_exist; - -@@ -105,6 +181,12 @@ fileline_initialize (struct backtrace_state *state, - snprintf (buf, sizeof (buf), "/proc/%ld/object/a.out", - (long) getpid ()); - filename = buf; -+ break; -+ case 5: -+ filename = sysctl_exec_name1 (state, error_callback, data); -+ break; -+ case 6: -+ filename = sysctl_exec_name2 (state, error_callback, data); - break; - default: - abort (); Property changes on: head/lang/rust-nightly/files/patch-vendor_backtrace-sys_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-vendor_backtrace-sys_build.rs =================================================================== --- head/lang/rust-nightly/files/patch-vendor_backtrace-sys_build.rs (revision 529274) +++ head/lang/rust-nightly/files/patch-vendor_backtrace-sys_build.rs (nonexistent) @@ -1,17 +0,0 @@ -https://github.com/rust-lang/backtrace-rs/pull/294 - ---- vendor/backtrace-sys/build.rs.orig 2020-02-19 21:11:31 UTC -+++ vendor/backtrace-sys/build.rs -@@ -60,6 +60,12 @@ fn main() { - File::create(out_dir.join("config.h")).unwrap(); - if target.contains("android") { - maybe_enable_dl_iterate_phdr_android(&mut build); -+ } else if target.contains("freebsd") { -+ build.define("HAVE_DL_ITERATE_PHDR", "1"); -+ build.define("HAVE_KERN_PROC", "1"); -+ } else if target.contains("netbsd") { -+ build.define("HAVE_DL_ITERATE_PHDR", "1"); -+ build.define("HAVE_KERN_PROC_ARGS", "1"); - } else if !target.contains("apple-ios") - && !target.contains("solaris") - && !target.contains("redox") Property changes on: head/lang/rust-nightly/files/patch-vendor_backtrace-sys_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