From 87c5eea3cbd87f3753d5ee7214bbe28eef81098f Mon Sep 17 00:00:00 2001 From: Ximin Luo Date: Tue, 24 Dec 2019 22:10:47 +0000 Subject: [PATCH] Update control and patches for 1.40.0 --- debian/changelog | 6 +++ debian/control | 10 ++--- debian/libstd-rust-1.39.lintian-overrides | 12 ------ debian/libstd-rust-1.40.lintian-overrides | 12 ++++++ debian/patches/series | 1 - .../u-0001-Hopefully-fix-rustdoc-build.patch | 38 ------------------- 6 files changed, 23 insertions(+), 56 deletions(-) delete mode 100644 debian/libstd-rust-1.39.lintian-overrides create mode 100644 debian/libstd-rust-1.40.lintian-overrides delete mode 100644 debian/patches/u-0001-Hopefully-fix-rustdoc-build.patch diff --git a/debian/changelog b/debian/changelog index 3e16acdcc6..a55b23586d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +rustc (1.40.0+dfsg1-1~exp1) UNRELEASED; urgency=medium + + * New upstream release. + + -- Ximin Luo Tue, 24 Dec 2019 22:10:01 +0000 + rustc (1.39.0+dfsg1-4) unstable; urgency=medium * Update to LLVM 9. (Closes: #946886) diff --git a/debian/control b/debian/control index 87696ea92a..a3826063a6 100644 --- a/debian/control +++ b/debian/control @@ -10,8 +10,8 @@ Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.17.14), python3:native, cargo:native (>= 0.40.0) , - rustc:native (>= 1.38.0+dfsg) , - rustc:native (<= 1.39.0++) , + rustc:native (>= 1.39.0+dfsg) , + rustc:native (<= 1.40.0++) , llvm-9-dev:native, llvm-9-tools:native, libllvm9 (>= 1:9.0.1-2), @@ -49,7 +49,7 @@ Multi-Arch: allowed Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends}, libstd-rust-dev (= ${binary:Version}), gcc, libc-dev, binutils (>= 2.26) -Recommends: cargo (>= 0.40.0~~), cargo (<< 0.41.0~~), rust-gdb | rust-lldb +Recommends: cargo (>= 0.41.0~~), cargo (<< 0.42.0~~), rust-gdb | rust-lldb Suggests: rust-doc, rust-src, lld-9 Replaces: libstd-rust-dev (<< 1.25.0+dfsg1-2~~) Breaks: libstd-rust-dev (<< 1.25.0+dfsg1-2~~) @@ -66,7 +66,7 @@ Description: Rust systems programming language generic programming and meta-programming, in both static and dynamic styles. -Package: libstd-rust-1.39 +Package: libstd-rust-1.40 Section: libs Architecture: any Multi-Arch: same @@ -91,7 +91,7 @@ Package: libstd-rust-dev Section: libdevel Architecture: any Multi-Arch: same -Depends: ${shlibs:Depends}, ${misc:Depends}, libstd-rust-1.39 (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, libstd-rust-1.40 (= ${binary:Version}) Description: Rust standard libraries - development files Rust is a curly-brace, block-structured expression language. It visually resembles the C language family, but differs significantly diff --git a/debian/libstd-rust-1.39.lintian-overrides b/debian/libstd-rust-1.39.lintian-overrides deleted file mode 100644 index 33c1befadf..0000000000 --- a/debian/libstd-rust-1.39.lintian-overrides +++ /dev/null @@ -1,12 +0,0 @@ -# "libstd" just seemed too generic -libstd-rust-1.39 binary: package-name-doesnt-match-sonames - -# Rust doesn't use dev shlib symlinks nor any of the other shlib support stuff -libstd-rust-1.39 binary: dev-pkg-without-shlib-symlink -libstd-rust-1.39 binary: shlib-without-versioned-soname -libstd-rust-1.39 binary: unused-shlib-entry-in-control-file - -# Libraries that use libc symbols (libterm, libstd, etc) *are* linked -# to libc. Lintian gets upset that some Rust libraries don't need -# libc, boo hoo. -libstd-rust-1.39 binary: library-not-linked-against-libc diff --git a/debian/libstd-rust-1.40.lintian-overrides b/debian/libstd-rust-1.40.lintian-overrides new file mode 100644 index 0000000000..ff8945c87f --- /dev/null +++ b/debian/libstd-rust-1.40.lintian-overrides @@ -0,0 +1,12 @@ +# "libstd" just seemed too generic +libstd-rust-1.40 binary: package-name-doesnt-match-sonames + +# Rust doesn't use dev shlib symlinks nor any of the other shlib support stuff +libstd-rust-1.40 binary: dev-pkg-without-shlib-symlink +libstd-rust-1.40 binary: shlib-without-versioned-soname +libstd-rust-1.40 binary: unused-shlib-entry-in-control-file + +# Libraries that use libc symbols (libterm, libstd, etc) *are* linked +# to libc. Lintian gets upset that some Rust libraries don't need +# libc, boo hoo. +libstd-rust-1.40 binary: library-not-linked-against-libc diff --git a/debian/patches/series b/debian/patches/series index 31729afb3f..0ea7d60c67 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,7 +1,6 @@ # Patches for upstream # pending, or forwarded -u-0001-Hopefully-fix-rustdoc-build.patch u-reproducible-build.patch u-prefer-local-css.patch u-make-tests-work-without-rpath.patch diff --git a/debian/patches/u-0001-Hopefully-fix-rustdoc-build.patch b/debian/patches/u-0001-Hopefully-fix-rustdoc-build.patch deleted file mode 100644 index 06ca58ea7b..0000000000 --- a/debian/patches/u-0001-Hopefully-fix-rustdoc-build.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 73369f32621f6a844a80a8513ae3ded901e4a406 Mon Sep 17 00:00:00 2001 -From: Mark Rousskov -Date: Tue, 5 Nov 2019 11:16:46 -0500 -Subject: [PATCH] Hopefully fix rustdoc build - -It's super unclear why this broke when we switched to beta but not -previously -- but at least it's hopefully fixed now. ---- - src/bootstrap/builder.rs | 13 ++++++++++++- - 1 file changed, 12 insertions(+), 1 deletion(-) - -diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs -index 2748903f2d47..2edcef203ad2 100644 ---- a/src/bootstrap/builder.rs -+++ b/src/bootstrap/builder.rs -@@ -886,7 +886,18 @@ impl<'a> Builder<'a> { - // things still build right, please do! - match mode { - Mode::Std => metadata.push_str("std"), -- _ => {}, -+ // When we're building rustc tools, they're built with a search path -+ // that contains things built during the rustc build. For example, -+ // bitflags is built during the rustc build, and is a dependency of -+ // rustdoc as well. We're building rustdoc in a different target -+ // directory, though, which means that Cargo will rebuild the -+ // dependency. When we go on to build rustdoc, we'll look for -+ // bitflags, and find two different copies: one built during the -+ // rustc step and one that we just built. This isn't always a -+ // problem, somehow -- not really clear why -- but we know that this -+ // fixes things. -+ Mode::ToolRustc => metadata.push_str("tool-rustc"), -+ _ => {} - } - cargo.env("__CARGO_DEFAULT_LIB_METADATA", &metadata); - --- -2.23.0 -