diff options
author | Tobias Kortkamp <tobik@FreeBSD.org> | 2020-03-27 17:59:19 +0000 |
---|---|---|
committer | Tobias Kortkamp <tobik@FreeBSD.org> | 2020-03-27 17:59:19 +0000 |
commit | 17f161686e5cbe3459039852d6f792023f1ffcee (patch) | |
tree | cf0ce4b380411dcfd059afa5497fe432a05dd02c /lang | |
parent | e9b3a7a3530352bed0e8cb72b8a265372c4a0fc7 (diff) | |
download | ports-17f161686e5cbe3459039852d6f792023f1ffcee.tar.gz ports-17f161686e5cbe3459039852d6f792023f1ffcee.zip |
lang/rust-nightly: Update to 1.44.0.20200327
Notes
Notes:
svn path=/head/; revision=529275
Diffstat (limited to 'lang')
-rw-r--r-- | lang/rust-nightly/Makefile | 2 | ||||
-rw-r--r-- | lang/rust-nightly/distinfo | 6 | ||||
-rw-r--r-- | lang/rust-nightly/files/patch-vendor_backtrace-sys_build.rs | 17 | ||||
-rw-r--r-- | lang/rust-nightly/files/patch-vendor_backtrace-sys_src_libbacktrace_fileline.c | 117 |
4 files changed, 4 insertions, 138 deletions
diff --git a/lang/rust-nightly/Makefile b/lang/rust-nightly/Makefile index 200bcf93ea82..62fffeb962f1 100644 --- a/lang/rust-nightly/Makefile +++ b/lang/rust-nightly/Makefile @@ -18,7 +18,7 @@ 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 diff --git a/lang/rust-nightly/distinfo b/lang/rust-nightly/distinfo index a4c3050d3ebb..1f980d005c20 100644 --- a/lang/rust-nightly/distinfo +++ b/lang/rust-nightly/distinfo @@ -1,6 +1,6 @@ -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 diff --git a/lang/rust-nightly/files/patch-vendor_backtrace-sys_build.rs b/lang/rust-nightly/files/patch-vendor_backtrace-sys_build.rs deleted file mode 100644 index 32a363623ac4..000000000000 --- a/lang/rust-nightly/files/patch-vendor_backtrace-sys_build.rs +++ /dev/null @@ -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") diff --git a/lang/rust-nightly/files/patch-vendor_backtrace-sys_src_libbacktrace_fileline.c b/lang/rust-nightly/files/patch-vendor_backtrace-sys_src_libbacktrace_fileline.c deleted file mode 100644 index 07713763576e..000000000000 --- a/lang/rust-nightly/files/patch-vendor_backtrace-sys_src_libbacktrace_fileline.c +++ /dev/null @@ -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 <stdlib.h> - #include <unistd.h> - -+#if defined (HAVE_KERN_PROC_ARGS) || defined (HAVE_KERN_PROC) -+#include <sys/sysctl.h> -+#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 (); |