--- Begin Message ---
Package: release.debian.org
Severity: normal
Tags: buster
User: release.debian.org@packages.debian.org
Usertags: pu
Hi,
This updates buster's rustc to 1.41, as needed by the new firefox 78 ESR.
The bootstrap happens with the upstream binaries as we've done in the past.
I have also avoided the bump to LLVM 9/10, we use buster's LLVM 7 instead.
After this update, we'll also need cargo (trivial backport, no stage0 binaries
required) and cbindgen.
Other than testing the above packages as well as firefox-esr 78 with the new
rust, I have performed a mass rebuild of all of rustc's build-depends in
buster main with the new rustc and cargo. Out of 458 packages (excluding
those two, plus firefox/thunderbird), there were 21 failures, most of which
I could identify as being caused by a change in Debian's cargo wrapper,
which is called by dh-cargo to build packages. After reverting that change
(which relied on debhelper setting DESTDIR in the install phase, called
in some cases were there isn't a single librust-foo-dev package), the list
of failing packages got down to 5. After testing those 5 against the current
rustc/cargo in buster, two of them also failed (rust-simd, rust-coresimd),
so there are only 3 regressions:
- rust-nodrop-union
- rust-rustyline
- librsvg
The former two have no rdeps in buster, so no big deal. librsvg is failing
on one of the vendored rust deps, we can probably update to a newer 2.44.x
version (which bumps those deps) or get a minimal fix.
I'm attaching the 1.41.1+dfsg1-1 -> 1.41.1+dfsg1-1~deb10u1 debdiff. I doubt
the other one would be useful, but if you want I can upload it somewhere.
Thanks,
Emilio
diff -Nru rustc-1.41.1+dfsg1/debian/architecture.mk rustc-1.41.1+dfsg1/debian/architecture.mk
--- rustc-1.41.1+dfsg1/debian/architecture.mk 2020-01-04 05:16:35.000000000 +0100
+++ rustc-1.41.1+dfsg1/debian/architecture.mk 2020-09-08 18:38:19.000000000 +0200
@@ -5,8 +5,7 @@
rust_cpu = $(subst i586,i686,\
$(if $(findstring -riscv64-,-$(2)-),$(subst riscv64,riscv64gc,$(1)),\
$(if $(findstring -armhf-,-$(2)-),$(subst arm,armv7,$(1)),\
-$(if $(findstring -armel-,-$(2)-),$(subst arm,armv5te,$(1)),\
-$(1)))))
+$(1))))
rust_type_setvar = $(1)_RUST_TYPE ?= $(call rust_cpu,$($(1)_GNU_CPU),$($(1)_ARCH))-unknown-$($(1)_GNU_SYSTEM)
$(foreach machine,BUILD HOST TARGET,\
diff -Nru rustc-1.41.1+dfsg1/debian/bin/rust-lld rustc-1.41.1+dfsg1/debian/bin/rust-lld
--- rustc-1.41.1+dfsg1/debian/bin/rust-lld 2020-01-05 18:05:51.000000000 +0100
+++ rustc-1.41.1+dfsg1/debian/bin/rust-lld 2020-09-08 18:38:19.000000000 +0200
@@ -6,4 +6,4 @@
# However the tests fail for other reasons, namely we can't build rustdoc
# (which runs the tests) in wasm32 yet. So this is just WIP at the moment,
# it is not expect to work nor to be installed on user machines.
-exec /usr/bin/lld-9 "${@/#-Wl,/}"
+exec /usr/bin/lld-7 "${@/#-Wl,/}"
diff -Nru rustc-1.41.1+dfsg1/debian/changelog rustc-1.41.1+dfsg1/debian/changelog
--- rustc-1.41.1+dfsg1/debian/changelog 2020-04-04 00:41:11.000000000 +0200
+++ rustc-1.41.1+dfsg1/debian/changelog 2020-09-08 18:38:19.000000000 +0200
@@ -1,3 +1,15 @@
+rustc (1.41.1+dfsg1-1~deb10u1) buster; urgency=medium
+
+ * Non-maintainer upload.
+ * Backport to buster.
+ * stage0 build.
+ - Use arm-unknown-linux-gnueabi target for armel.
+ * Use LLVM 7.
+ * Disable wasm.
+ * Reduce debugging symbols on i386 to avoid FTBFS due to OOM.
+
+ -- Emilio Pozuelo Monfort <pochu@debian.org> Tue, 08 Sep 2020 18:38:19 +0200
+
rustc (1.41.1+dfsg1-1) unstable; urgency=medium
* Upload to unstable.
diff -Nru rustc-1.41.1+dfsg1/debian/control rustc-1.41.1+dfsg1/debian/control
--- rustc-1.41.1+dfsg1/debian/control 2020-03-09 00:27:03.000000000 +0100
+++ rustc-1.41.1+dfsg1/debian/control 2020-09-08 18:38:19.000000000 +0200
@@ -9,12 +9,12 @@
Build-Depends: debhelper (>= 9),
dpkg-dev (>= 1.17.14),
python3:native,
- cargo:native (>= 0.40.0) <!pkg.rustc.dlstage0>,
- rustc:native (>= 1.40.0+dfsg) <!pkg.rustc.dlstage0>,
- rustc:native (<= 1.41.1++) <!pkg.rustc.dlstage0>,
- llvm-9-dev:native,
- llvm-9-tools:native,
- libllvm9 (>= 1:9.0.1-2),
+# cargo:native (>= 0.40.0) <!pkg.rustc.dlstage0>,
+# rustc:native (>= 1.40.0+dfsg) <!pkg.rustc.dlstage0>,
+# rustc:native (<= 1.41.1++) <!pkg.rustc.dlstage0>,
+ llvm-7-dev:native,
+ llvm-7-tools:native,
+# libllvm7 (>= 1:9.0.1-2),
autotools-dev,
cmake (>= 3.0) | cmake3,
# needed by some vendor crates
@@ -33,9 +33,9 @@
# Extra build-deps needed for x.py to download stuff in pkg.rustc.dlstage0.
curl <pkg.rustc.dlstage0>,
ca-certificates <pkg.rustc.dlstage0>,
-Build-Depends-Indep:
- wasi-libc (>= 0.0~git20191220.a280fea~~) <!nowasm>,
- wasi-libc (<= 0.0~git20191220.a280fea++) <!nowasm>,
+#Build-Depends-Indep:
+# wasi-libc (>= 0.0~git20191220.a280fea~~) <!nowasm>,
+# wasi-libc (<= 0.0~git20191220.a280fea++) <!nowasm>,
Build-Conflicts: gdb-minimal <!nocheck>
Standards-Version: 4.2.1
Homepage: http://www.rust-lang.org/
@@ -49,7 +49,7 @@
Depends: ${shlibs:Depends}, ${misc:Depends}, libstd-rust-dev (= ${binary:Version}),
gcc, libc-dev, binutils (>= 2.26)
Recommends: cargo (>= 0.42.0~~), cargo (<< 0.43.0~~), rust-gdb | rust-lldb
-Suggests: rust-doc, rust-src, lld-9
+Suggests: rust-doc, rust-src, lld-7
Replaces: libstd-rust-dev (<< 1.25.0+dfsg1-2~~)
Breaks: libstd-rust-dev (<< 1.25.0+dfsg1-2~~)
Description: Rust systems programming language
@@ -107,28 +107,28 @@
This package contains development files necessary to use the standard
Rust libraries.
-Package: libstd-rust-dev-wasm32-cross
-Section: libdevel
-Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, lld-9
-# Embeds wasi-libc so doesn't need to depend on it
-# None of its licenses require source redistrib, so no need for Built-Using
-Build-Profiles: <!nowasm>
-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
- in syntactic and semantic details. Its design is oriented toward
- concerns of "programming in the large", that is, of creating and
- maintaining boundaries - both abstract and operational - that
- preserve large-system integrity, availability and concurrency.
- .
- It supports a mixture of imperative procedural, concurrent actor,
- object-oriented and pure functional styles. Rust also supports
- generic programming and meta-programming, in both static and dynamic
- styles.
- .
- This package contains development files necessary to use the standard
- Rust libraries, for cross-compiling to the wasm32-unknown-unknown target.
+#Package: libstd-rust-dev-wasm32-cross
+#Section: libdevel
+#Architecture: all
+#Depends: ${shlibs:Depends}, ${misc:Depends}, lld-7
+## Embeds wasi-libc so doesn't need to depend on it
+## None of its licenses require source redistrib, so no need for Built-Using
+#Build-Profiles: <!nowasm>
+#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
+# in syntactic and semantic details. Its design is oriented toward
+# concerns of "programming in the large", that is, of creating and
+# maintaining boundaries - both abstract and operational - that
+# preserve large-system integrity, availability and concurrency.
+# .
+# It supports a mixture of imperative procedural, concurrent actor,
+# object-oriented and pure functional styles. Rust also supports
+# generic programming and meta-programming, in both static and dynamic
+# styles.
+# .
+# This package contains development files necessary to use the standard
+# Rust libraries, for cross-compiling to the wasm32-unknown-unknown target.
Package: rust-gdb
Architecture: all
@@ -154,7 +154,7 @@
Package: rust-lldb
Architecture: all
# When updating, also update rust-lldb.links
-Depends: lldb-9, ${misc:Depends}, python3-lldb-9
+Depends: lldb-7, ${misc:Depends}, python3-lldb-7
Replaces: rustc (<< 1.1.0+dfsg1-1)
Description: Rust debugger (lldb)
Rust is a curly-brace, block-structured expression language. It
diff -Nru rustc-1.41.1+dfsg1/debian/make_orig-stage0_tarball.sh rustc-1.41.1+dfsg1/debian/make_orig-stage0_tarball.sh
--- rustc-1.41.1+dfsg1/debian/make_orig-stage0_tarball.sh 2019-04-30 01:15:49.000000000 +0200
+++ rustc-1.41.1+dfsg1/debian/make_orig-stage0_tarball.sh 2020-09-08 18:38:19.000000000 +0200
@@ -7,7 +7,7 @@
set -e
upstream_version="$(dpkg-parsechangelog -SVersion | sed -e 's/\(.*\)-.*/\1/g')"
-upstream_bootstrap_arch="${upstream_bootstrap_arch:-amd64 arm64 armhf i386 mips64 mips64el powerpc ppc64 ppc64el s390x}"
+upstream_bootstrap_arch="${upstream_bootstrap_arch:-amd64 arm64 armel armhf i386 mips mips64el mipsel ppc64el s390x}"
rm -f stage0/*/*.sha256
mkdir -p stage0 build && ln -sf ../stage0 build/cache
diff -Nru rustc-1.41.1+dfsg1/debian/patches/d-add-bootstrap-checksums.patch rustc-1.41.1+dfsg1/debian/patches/d-add-bootstrap-checksums.patch
--- rustc-1.41.1+dfsg1/debian/patches/d-add-bootstrap-checksums.patch 1970-01-01 01:00:00.000000000 +0100
+++ rustc-1.41.1+dfsg1/debian/patches/d-add-bootstrap-checksums.patch 2020-09-08 18:38:19.000000000 +0200
@@ -0,0 +1,114 @@
+Description: signatures for stage0 binaries
+
+--- /dev/null
++++ rustc-1.41.1+dfsg1/stage0/2019-12-19/cargo-0.41.0-aarch64-unknown-linux-gnu.tar.xz.sha256
+@@ -0,0 +1 @@
++9c675cbb2e23f17804938a7b4c4955a6b870c51de4aedbe7551a7b8c04d13e0e cargo-0.41.0-aarch64-unknown-linux-gnu.tar.xz
+--- /dev/null
++++ rustc-1.41.1+dfsg1/stage0/2019-12-19/cargo-0.41.0-armv7-unknown-linux-gnueabihf.tar.xz.sha256
+@@ -0,0 +1 @@
++bbae95c5c4224fed063559c8d7f65b3ee280a62d2471e2c7a01d7a14896d3e04 cargo-0.41.0-armv7-unknown-linux-gnueabihf.tar.xz
+--- /dev/null
++++ rustc-1.41.1+dfsg1/stage0/2019-12-19/cargo-0.41.0-i686-unknown-linux-gnu.tar.xz.sha256
+@@ -0,0 +1 @@
++c48bc132f4025ff39b1b6dc52aef9d406c3f926ce05fe92d943ceab7a5fd6058 cargo-0.41.0-i686-unknown-linux-gnu.tar.xz
+--- /dev/null
++++ rustc-1.41.1+dfsg1/stage0/2019-12-19/cargo-0.41.0-mips-unknown-linux-gnu.tar.xz.sha256
+@@ -0,0 +1 @@
++6e2c5b4333176353af182a610a417409c67f06eb6a1b5164189bd8d465da7136 cargo-0.41.0-mips-unknown-linux-gnu.tar.xz
+--- /dev/null
++++ rustc-1.41.1+dfsg1/stage0/2019-12-19/cargo-0.41.0-mips64el-unknown-linux-gnuabi64.tar.xz.sha256
+@@ -0,0 +1 @@
++093030a8b2a881a9e939a7a93541b447c2b23a20270463e97c6d3d0828e9d68a cargo-0.41.0-mips64el-unknown-linux-gnuabi64.tar.xz
+--- /dev/null
++++ rustc-1.41.1+dfsg1/stage0/2019-12-19/cargo-0.41.0-mipsel-unknown-linux-gnu.tar.xz.sha256
+@@ -0,0 +1 @@
++08a390d88d1e46419c52384d28e5c22b3a3028f71ae1c1a6a1f3f43fa91b9e92 cargo-0.41.0-mipsel-unknown-linux-gnu.tar.xz
+--- /dev/null
++++ rustc-1.41.1+dfsg1/stage0/2019-12-19/cargo-0.41.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256
+@@ -0,0 +1 @@
++7705f21d938a72ba6f01818661b2dea29183209940a335f18d1761e1e03d3710 cargo-0.41.0-powerpc64le-unknown-linux-gnu.tar.xz
+--- /dev/null
++++ rustc-1.41.1+dfsg1/stage0/2019-12-19/cargo-0.41.0-s390x-unknown-linux-gnu.tar.xz.sha256
+@@ -0,0 +1 @@
++21e285a5f67df44849d6cbaa31dde941f238f860c027ec1c2f10aebce70eb2b5 cargo-0.41.0-s390x-unknown-linux-gnu.tar.xz
+--- /dev/null
++++ rustc-1.41.1+dfsg1/stage0/2019-12-19/cargo-0.41.0-x86_64-unknown-linux-gnu.tar.xz.sha256
+@@ -0,0 +1 @@
++9b6ae643fa240c5ecbc1dc390f4020b6a683f25bac6f7437ebd4b9d32a8d0b6c cargo-0.41.0-x86_64-unknown-linux-gnu.tar.xz
+--- /dev/null
++++ rustc-1.41.1+dfsg1/stage0/2019-12-19/rust-std-1.40.0-aarch64-unknown-linux-gnu.tar.xz.sha256
+@@ -0,0 +1 @@
++1abd1865e8339c2cac6992a11f6f98b66fa2b97f67acaddcf1992e39a7001bfc rust-std-1.40.0-aarch64-unknown-linux-gnu.tar.xz
+--- /dev/null
++++ rustc-1.41.1+dfsg1/stage0/2019-12-19/rust-std-1.40.0-armv5te-unknown-linux-gnueabi.tar.xz.sha256
+@@ -0,0 +1 @@
++c95b2defe9fa99299d7dd3dc62d2ec3222b7cb247f7b13bb6b6d8b2b42445858 rust-std-1.40.0-armv5te-unknown-linux-gnueabi.tar.xz
+--- /dev/null
++++ rustc-1.41.1+dfsg1/stage0/2019-12-19/rust-std-1.40.0-armv7-unknown-linux-gnueabihf.tar.xz.sha256
+@@ -0,0 +1 @@
++9d4aad78db894a76e9682f2095ac024cc4748b2933f9f7248bf571923f7693c4 rust-std-1.40.0-armv7-unknown-linux-gnueabihf.tar.xz
+--- /dev/null
++++ rustc-1.41.1+dfsg1/stage0/2019-12-19/rust-std-1.40.0-i686-unknown-linux-gnu.tar.xz.sha256
+@@ -0,0 +1 @@
++beab29565d12a6b9db4ef471c34d4c034295760095f7edc3f7b6c51fc08589a0 rust-std-1.40.0-i686-unknown-linux-gnu.tar.xz
+--- /dev/null
++++ rustc-1.41.1+dfsg1/stage0/2019-12-19/rust-std-1.40.0-mips-unknown-linux-gnu.tar.xz.sha256
+@@ -0,0 +1 @@
++c25790d43e0a01e5f45607b067b22ae96163d5eae877cee1b2b35ce0d43ab9b5 rust-std-1.40.0-mips-unknown-linux-gnu.tar.xz
+--- /dev/null
++++ rustc-1.41.1+dfsg1/stage0/2019-12-19/rust-std-1.40.0-mips64el-unknown-linux-gnuabi64.tar.xz.sha256
+@@ -0,0 +1 @@
++9a4cfebee845dfd50f0f10c3019b89af3747c3aed1a797042285f3cea5a3eb30 rust-std-1.40.0-mips64el-unknown-linux-gnuabi64.tar.xz
+--- /dev/null
++++ rustc-1.41.1+dfsg1/stage0/2019-12-19/rust-std-1.40.0-mipsel-unknown-linux-gnu.tar.xz.sha256
+@@ -0,0 +1 @@
++ab738a37c1cac1aaec7cb34556fa9bfff46dc912baf360a27e9d81311120ec4a rust-std-1.40.0-mipsel-unknown-linux-gnu.tar.xz
+--- /dev/null
++++ rustc-1.41.1+dfsg1/stage0/2019-12-19/rust-std-1.40.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256
+@@ -0,0 +1 @@
++4eb3141fb6c3d3e101b5d4493664c9a01d4bb9eebdf4b96f5c26a81188c2452d rust-std-1.40.0-powerpc64le-unknown-linux-gnu.tar.xz
+--- /dev/null
++++ rustc-1.41.1+dfsg1/stage0/2019-12-19/rust-std-1.40.0-s390x-unknown-linux-gnu.tar.xz.sha256
+@@ -0,0 +1 @@
++acd6f74c537468d3d7ca8b0fdf9cff536816649ac10a554182c6a25e5db824af rust-std-1.40.0-s390x-unknown-linux-gnu.tar.xz
+--- /dev/null
++++ rustc-1.41.1+dfsg1/stage0/2019-12-19/rust-std-1.40.0-x86_64-unknown-linux-gnu.tar.xz.sha256
+@@ -0,0 +1 @@
++5a0b14a51f51b0194f70a2023749d9cb49c3b2e11f0d4c8232960b91fad336ac rust-std-1.40.0-x86_64-unknown-linux-gnu.tar.xz
+--- /dev/null
++++ rustc-1.41.1+dfsg1/stage0/2019-12-19/rustc-1.40.0-aarch64-unknown-linux-gnu.tar.xz.sha256
+@@ -0,0 +1 @@
++40619bf6316706e9d8f9d842802e9e00018140ffb3e937d807299b5a28af4536 rustc-1.40.0-aarch64-unknown-linux-gnu.tar.xz
+--- /dev/null
++++ rustc-1.41.1+dfsg1/stage0/2019-12-19/rustc-1.40.0-armv7-unknown-linux-gnueabihf.tar.xz.sha256
+@@ -0,0 +1 @@
++bfe3d472f2ff96a456ce0887f1dd445a56170254eadee5f43f0c9ee01a2c97f1 rustc-1.40.0-armv7-unknown-linux-gnueabihf.tar.xz
+--- /dev/null
++++ rustc-1.41.1+dfsg1/stage0/2019-12-19/rustc-1.40.0-i686-unknown-linux-gnu.tar.xz.sha256
+@@ -0,0 +1 @@
++257e4789043098a5e3b4fa85ea988019f37d640a10f83d39ada00fb23e057b8a rustc-1.40.0-i686-unknown-linux-gnu.tar.xz
+--- /dev/null
++++ rustc-1.41.1+dfsg1/stage0/2019-12-19/rustc-1.40.0-mips-unknown-linux-gnu.tar.xz.sha256
+@@ -0,0 +1 @@
++98aef08d3bb880b9cea6e87d82ab53c064ee669b5261f5adc971fed49381866f rustc-1.40.0-mips-unknown-linux-gnu.tar.xz
+--- /dev/null
++++ rustc-1.41.1+dfsg1/stage0/2019-12-19/rustc-1.40.0-mips64el-unknown-linux-gnuabi64.tar.xz.sha256
+@@ -0,0 +1 @@
++f05e32125075eb61d9d90ad2ef3063ce76495ea356842e935ce06b9e8a621627 rustc-1.40.0-mips64el-unknown-linux-gnuabi64.tar.xz
+--- /dev/null
++++ rustc-1.41.1+dfsg1/stage0/2019-12-19/rustc-1.40.0-mipsel-unknown-linux-gnu.tar.xz.sha256
+@@ -0,0 +1 @@
++9d77489603614f88dcc4b11a853a66fcff8e12c218907eb492901c93940acc15 rustc-1.40.0-mipsel-unknown-linux-gnu.tar.xz
+--- /dev/null
++++ rustc-1.41.1+dfsg1/stage0/2019-12-19/rustc-1.40.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256
+@@ -0,0 +1 @@
++aa07a07ad272de825da8c18ad8dc4143a25bd28e5538d68c3bced53f060432b4 rustc-1.40.0-powerpc64le-unknown-linux-gnu.tar.xz
+--- /dev/null
++++ rustc-1.41.1+dfsg1/stage0/2019-12-19/rustc-1.40.0-s390x-unknown-linux-gnu.tar.xz.sha256
+@@ -0,0 +1 @@
++04ef2b7c298169351944e025e3ce5708d288d450b84718f0af916d61ed0f425e rustc-1.40.0-s390x-unknown-linux-gnu.tar.xz
+--- /dev/null
++++ rustc-1.41.1+dfsg1/stage0/2019-12-19/rustc-1.40.0-x86_64-unknown-linux-gnu.tar.xz.sha256
+@@ -0,0 +1 @@
++b1c00618b7a98156e88b14682508a503284f85748eab23de749a20dcc8847111 rustc-1.40.0-x86_64-unknown-linux-gnu.tar.xz
diff -Nru rustc-1.41.1+dfsg1/debian/patches/d-rust-lldb-paths rustc-1.41.1+dfsg1/debian/patches/d-rust-lldb-paths
--- rustc-1.41.1+dfsg1/debian/patches/d-rust-lldb-paths 2019-12-16 23:33:32.000000000 +0100
+++ rustc-1.41.1+dfsg1/debian/patches/d-rust-lldb-paths 2020-09-08 18:38:19.000000000 +0200
@@ -11,7 +11,7 @@
RUST_LLDB="$RUSTC_SYSROOT/lib/rustlib/$host/bin/lldb"
-lldb=lldb
-+lldb=lldb-9
++lldb=lldb-7
if [ -f "$RUST_LLDB" ]; then
lldb="$RUST_LLDB"
else
diff -Nru rustc-1.41.1+dfsg1/debian/patches/series rustc-1.41.1+dfsg1/debian/patches/series
--- rustc-1.41.1+dfsg1/debian/patches/series 2020-03-09 00:58:18.000000000 +0100
+++ rustc-1.41.1+dfsg1/debian/patches/series 2020-09-08 18:38:19.000000000 +0200
@@ -50,3 +50,5 @@
# Work around for some porterboxes, keep this commented
#d-host-duplicates.patch
+
+d-add-bootstrap-checksums.patch
diff -Nru rustc-1.41.1+dfsg1/debian/rules rustc-1.41.1+dfsg1/debian/rules
--- rustc-1.41.1+dfsg1/debian/rules 2020-03-09 00:43:28.000000000 +0100
+++ rustc-1.41.1+dfsg1/debian/rules 2020-09-08 18:38:19.000000000 +0200
@@ -33,8 +33,8 @@
DEB_DESTDIR := $(CURDIR)/debian/tmp
# Use system LLVM (comment out to use vendored LLVM)
-LLVM_VERSION = 9
-OLD_LLVM_VERSION = 8
+LLVM_VERSION = 7
+OLD_LLVM_VERSION = 9
# Make it easier to test against a custom LLVM
ifneq (,$(LLVM_DESTDIR))
LLVM_LIBRARY_PATH := $(LLVM_DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH):$(LLVM_DESTDIR)/usr/lib
@@ -112,7 +112,8 @@
BUILD_DOCS := false
endif
-BUILD_WASM := true
+#BUILD_WASM := true
+BUILD_WASM := false
ifneq (,$(findstring nowasm,$(DEB_BUILD_PROFILES)))
BUILD_WASM := false
endif
@@ -165,7 +166,7 @@
if $(DOWNLOAD_BOOTSTRAP) || [ $(HAVE_BINARY_TARBALL) != 0 ]; \
then sed -i -e '/^rustc = /d' -e '/^cargo = /d' "$@"; fi
# Work around low-memory (32-bit) architectures: https://github.com/rust-lang/rust/issues/45854
-ifneq (,$(filter $(DEB_BUILD_ARCH), armhf armel mips mipsel powerpc powerpcspe))
+ifneq (,$(filter $(DEB_BUILD_ARCH), armhf armel i386 mips mipsel powerpc powerpcspe))
sed -i -e 's/^debuginfo-level = .*/debuginfo-level = 0/g' "$@"
endif
@@ -175,7 +176,7 @@
debian/dh_auto_configure.stamp: debian/config.toml
# fail the build if we have any instances of OLD_LLVM_VERSION in debian, except for debian/changelog
- ! grep --color=always -i 'll\(..\|d\)-\?$(subst .,\.,$(OLD_LLVM_VERSION))' --exclude=changelog --exclude='*.patch' --exclude-dir='.debhelper' -R debian
+ #! grep --color=always -i 'll\(..\|d\)-\?$(subst .,\.,$(OLD_LLVM_VERSION))' --exclude=changelog --exclude='*.patch' --exclude-dir='.debhelper' -R debian
# fail the build if we accidentally vendored openssl, indicates we pulled in unnecessary dependencies
test ! -e vendor/openssl
# fail the build if we didn't update d-ignore-error-detail-diff.patch
diff -Nru rustc-1.41.1+dfsg1/debian/rustc.links rustc-1.41.1+dfsg1/debian/rustc.links
--- rustc-1.41.1+dfsg1/debian/rustc.links 2019-12-16 23:35:48.000000000 +0100
+++ rustc-1.41.1+dfsg1/debian/rustc.links 2020-09-08 18:38:19.000000000 +0200
@@ -1 +1 @@
-usr/bin/lld-9 usr/bin/rust-lld
+usr/bin/lld-7 usr/bin/rust-lld
diff -Nru rustc-1.41.1+dfsg1/debian/rust-lldb.links rustc-1.41.1+dfsg1/debian/rust-lldb.links
--- rustc-1.41.1+dfsg1/debian/rust-lldb.links 2019-12-16 23:33:45.000000000 +0100
+++ rustc-1.41.1+dfsg1/debian/rust-lldb.links 2020-09-08 18:38:19.000000000 +0200
@@ -1 +1 @@
-usr/share/man/man1/lldb-9.1.gz usr/share/man/man1/rust-lldb.1.gz
+usr/share/man/man1/lldb-7.1.gz usr/share/man/man1/rust-lldb.1.gz
Binary files /tmp/Api9NwJhzB/rustc-1.41.1+dfsg1/stage0/2019-12-19/cargo-0.41.0-aarch64-unknown-linux-gnu.tar.xz and /tmp/MF0ehsR9gE/rustc-1.41.1+dfsg1/stage0/2019-12-19/cargo-0.41.0-aarch64-unknown-linux-gnu.tar.xz differ
Binary files /tmp/Api9NwJhzB/rustc-1.41.1+dfsg1/stage0/2019-12-19/cargo-0.41.0-arm-unknown-linux-gnueabi.tar.xz and /tmp/MF0ehsR9gE/rustc-1.41.1+dfsg1/stage0/2019-12-19/cargo-0.41.0-arm-unknown-linux-gnueabi.tar.xz differ
diff -Nru rustc-1.41.1+dfsg1/stage0/2019-12-19/cargo-0.41.0-arm-unknown-linux-gnueabi.tar.xz.sha256 rustc-1.41.1+dfsg1/stage0/2019-12-19/cargo-0.41.0-arm-unknown-linux-gnueabi.tar.xz.sha256
--- rustc-1.41.1+dfsg1/stage0/2019-12-19/cargo-0.41.0-arm-unknown-linux-gnueabi.tar.xz.sha256 1970-01-01 01:00:00.000000000 +0100
+++ rustc-1.41.1+dfsg1/stage0/2019-12-19/cargo-0.41.0-arm-unknown-linux-gnueabi.tar.xz.sha256 2019-12-19 16:23:42.000000000 +0100
@@ -0,0 +1 @@
+f61fc8be4a66960543efce637123656fd06d7e0eb6df4a5f7a27572db02c398d cargo-0.41.0-arm-unknown-linux-gnueabi.tar.xz
Binary files /tmp/Api9NwJhzB/rustc-1.41.1+dfsg1/stage0/2019-12-19/cargo-0.41.0-armv7-unknown-linux-gnueabihf.tar.xz and /tmp/MF0ehsR9gE/rustc-1.41.1+dfsg1/stage0/2019-12-19/cargo-0.41.0-armv7-unknown-linux-gnueabihf.tar.xz differ
Binary files /tmp/Api9NwJhzB/rustc-1.41.1+dfsg1/stage0/2019-12-19/cargo-0.41.0-i686-unknown-linux-gnu.tar.xz and /tmp/MF0ehsR9gE/rustc-1.41.1+dfsg1/stage0/2019-12-19/cargo-0.41.0-i686-unknown-linux-gnu.tar.xz differ
Binary files /tmp/Api9NwJhzB/rustc-1.41.1+dfsg1/stage0/2019-12-19/cargo-0.41.0-mips64el-unknown-linux-gnuabi64.tar.xz and /tmp/MF0ehsR9gE/rustc-1.41.1+dfsg1/stage0/2019-12-19/cargo-0.41.0-mips64el-unknown-linux-gnuabi64.tar.xz differ
Binary files /tmp/Api9NwJhzB/rustc-1.41.1+dfsg1/stage0/2019-12-19/cargo-0.41.0-mipsel-unknown-linux-gnu.tar.xz and /tmp/MF0ehsR9gE/rustc-1.41.1+dfsg1/stage0/2019-12-19/cargo-0.41.0-mipsel-unknown-linux-gnu.tar.xz differ
Binary files /tmp/Api9NwJhzB/rustc-1.41.1+dfsg1/stage0/2019-12-19/cargo-0.41.0-mips-unknown-linux-gnu.tar.xz and /tmp/MF0ehsR9gE/rustc-1.41.1+dfsg1/stage0/2019-12-19/cargo-0.41.0-mips-unknown-linux-gnu.tar.xz differ
Binary files /tmp/Api9NwJhzB/rustc-1.41.1+dfsg1/stage0/2019-12-19/cargo-0.41.0-powerpc64le-unknown-linux-gnu.tar.xz and /tmp/MF0ehsR9gE/rustc-1.41.1+dfsg1/stage0/2019-12-19/cargo-0.41.0-powerpc64le-unknown-linux-gnu.tar.xz differ
Binary files /tmp/Api9NwJhzB/rustc-1.41.1+dfsg1/stage0/2019-12-19/cargo-0.41.0-s390x-unknown-linux-gnu.tar.xz and /tmp/MF0ehsR9gE/rustc-1.41.1+dfsg1/stage0/2019-12-19/cargo-0.41.0-s390x-unknown-linux-gnu.tar.xz differ
Binary files /tmp/Api9NwJhzB/rustc-1.41.1+dfsg1/stage0/2019-12-19/cargo-0.41.0-x86_64-unknown-linux-gnu.tar.xz and /tmp/MF0ehsR9gE/rustc-1.41.1+dfsg1/stage0/2019-12-19/cargo-0.41.0-x86_64-unknown-linux-gnu.tar.xz differ
Binary files /tmp/Api9NwJhzB/rustc-1.41.1+dfsg1/stage0/2019-12-19/rustc-1.40.0-aarch64-unknown-linux-gnu.tar.xz and /tmp/MF0ehsR9gE/rustc-1.41.1+dfsg1/stage0/2019-12-19/rustc-1.40.0-aarch64-unknown-linux-gnu.tar.xz differ
Binary files /tmp/Api9NwJhzB/rustc-1.41.1+dfsg1/stage0/2019-12-19/rustc-1.40.0-arm-unknown-linux-gnueabi.tar.xz and /tmp/MF0ehsR9gE/rustc-1.41.1+dfsg1/stage0/2019-12-19/rustc-1.40.0-arm-unknown-linux-gnueabi.tar.xz differ
diff -Nru rustc-1.41.1+dfsg1/stage0/2019-12-19/rustc-1.40.0-arm-unknown-linux-gnueabi.tar.xz.sha256 rustc-1.41.1+dfsg1/stage0/2019-12-19/rustc-1.40.0-arm-unknown-linux-gnueabi.tar.xz.sha256
--- rustc-1.41.1+dfsg1/stage0/2019-12-19/rustc-1.40.0-arm-unknown-linux-gnueabi.tar.xz.sha256 1970-01-01 01:00:00.000000000 +0100
+++ rustc-1.41.1+dfsg1/stage0/2019-12-19/rustc-1.40.0-arm-unknown-linux-gnueabi.tar.xz.sha256 2019-12-19 16:27:18.000000000 +0100
@@ -0,0 +1 @@
+bd2d6f35747e6433f5597e5136008ea4b9a506309b9b9ecdcc4fdd4e4379e89b rustc-1.40.0-arm-unknown-linux-gnueabi.tar.xz
Binary files /tmp/Api9NwJhzB/rustc-1.41.1+dfsg1/stage0/2019-12-19/rustc-1.40.0-armv7-unknown-linux-gnueabihf.tar.xz and /tmp/MF0ehsR9gE/rustc-1.41.1+dfsg1/stage0/2019-12-19/rustc-1.40.0-armv7-unknown-linux-gnueabihf.tar.xz differ
Binary files /tmp/Api9NwJhzB/rustc-1.41.1+dfsg1/stage0/2019-12-19/rustc-1.40.0-i686-unknown-linux-gnu.tar.xz and /tmp/MF0ehsR9gE/rustc-1.41.1+dfsg1/stage0/2019-12-19/rustc-1.40.0-i686-unknown-linux-gnu.tar.xz differ
Binary files /tmp/Api9NwJhzB/rustc-1.41.1+dfsg1/stage0/2019-12-19/rustc-1.40.0-mips64el-unknown-linux-gnuabi64.tar.xz and /tmp/MF0ehsR9gE/rustc-1.41.1+dfsg1/stage0/2019-12-19/rustc-1.40.0-mips64el-unknown-linux-gnuabi64.tar.xz differ
Binary files /tmp/Api9NwJhzB/rustc-1.41.1+dfsg1/stage0/2019-12-19/rustc-1.40.0-mipsel-unknown-linux-gnu.tar.xz and /tmp/MF0ehsR9gE/rustc-1.41.1+dfsg1/stage0/2019-12-19/rustc-1.40.0-mipsel-unknown-linux-gnu.tar.xz differ
Binary files /tmp/Api9NwJhzB/rustc-1.41.1+dfsg1/stage0/2019-12-19/rustc-1.40.0-mips-unknown-linux-gnu.tar.xz and /tmp/MF0ehsR9gE/rustc-1.41.1+dfsg1/stage0/2019-12-19/rustc-1.40.0-mips-unknown-linux-gnu.tar.xz differ
Binary files /tmp/Api9NwJhzB/rustc-1.41.1+dfsg1/stage0/2019-12-19/rustc-1.40.0-powerpc64le-unknown-linux-gnu.tar.xz and /tmp/MF0ehsR9gE/rustc-1.41.1+dfsg1/stage0/2019-12-19/rustc-1.40.0-powerpc64le-unknown-linux-gnu.tar.xz differ
Binary files /tmp/Api9NwJhzB/rustc-1.41.1+dfsg1/stage0/2019-12-19/rustc-1.40.0-s390x-unknown-linux-gnu.tar.xz and /tmp/MF0ehsR9gE/rustc-1.41.1+dfsg1/stage0/2019-12-19/rustc-1.40.0-s390x-unknown-linux-gnu.tar.xz differ
Binary files /tmp/Api9NwJhzB/rustc-1.41.1+dfsg1/stage0/2019-12-19/rustc-1.40.0-x86_64-unknown-linux-gnu.tar.xz and /tmp/MF0ehsR9gE/rustc-1.41.1+dfsg1/stage0/2019-12-19/rustc-1.40.0-x86_64-unknown-linux-gnu.tar.xz differ
Binary files /tmp/Api9NwJhzB/rustc-1.41.1+dfsg1/stage0/2019-12-19/rust-std-1.40.0-aarch64-unknown-linux-gnu.tar.xz and /tmp/MF0ehsR9gE/rustc-1.41.1+dfsg1/stage0/2019-12-19/rust-std-1.40.0-aarch64-unknown-linux-gnu.tar.xz differ
Binary files /tmp/Api9NwJhzB/rustc-1.41.1+dfsg1/stage0/2019-12-19/rust-std-1.40.0-arm-unknown-linux-gnueabi.tar.xz and /tmp/MF0ehsR9gE/rustc-1.41.1+dfsg1/stage0/2019-12-19/rust-std-1.40.0-arm-unknown-linux-gnueabi.tar.xz differ
diff -Nru rustc-1.41.1+dfsg1/stage0/2019-12-19/rust-std-1.40.0-arm-unknown-linux-gnueabi.tar.xz.sha256 rustc-1.41.1+dfsg1/stage0/2019-12-19/rust-std-1.40.0-arm-unknown-linux-gnueabi.tar.xz.sha256
--- rustc-1.41.1+dfsg1/stage0/2019-12-19/rust-std-1.40.0-arm-unknown-linux-gnueabi.tar.xz.sha256 1970-01-01 01:00:00.000000000 +0100
+++ rustc-1.41.1+dfsg1/stage0/2019-12-19/rust-std-1.40.0-arm-unknown-linux-gnueabi.tar.xz.sha256 2019-12-19 16:26:33.000000000 +0100
@@ -0,0 +1 @@
+14bd261dfc586dc8e1cb336b3c58b63de2af4881c970dd9b1e87f1364a866bcb rust-std-1.40.0-arm-unknown-linux-gnueabi.tar.xz
Binary files /tmp/Api9NwJhzB/rustc-1.41.1+dfsg1/stage0/2019-12-19/rust-std-1.40.0-armv5te-unknown-linux-gnueabi.tar.xz and /tmp/MF0ehsR9gE/rustc-1.41.1+dfsg1/stage0/2019-12-19/rust-std-1.40.0-armv5te-unknown-linux-gnueabi.tar.xz differ
Binary files /tmp/Api9NwJhzB/rustc-1.41.1+dfsg1/stage0/2019-12-19/rust-std-1.40.0-armv7-unknown-linux-gnueabihf.tar.xz and /tmp/MF0ehsR9gE/rustc-1.41.1+dfsg1/stage0/2019-12-19/rust-std-1.40.0-armv7-unknown-linux-gnueabihf.tar.xz differ
Binary files /tmp/Api9NwJhzB/rustc-1.41.1+dfsg1/stage0/2019-12-19/rust-std-1.40.0-i686-unknown-linux-gnu.tar.xz and /tmp/MF0ehsR9gE/rustc-1.41.1+dfsg1/stage0/2019-12-19/rust-std-1.40.0-i686-unknown-linux-gnu.tar.xz differ
Binary files /tmp/Api9NwJhzB/rustc-1.41.1+dfsg1/stage0/2019-12-19/rust-std-1.40.0-mips64el-unknown-linux-gnuabi64.tar.xz and /tmp/MF0ehsR9gE/rustc-1.41.1+dfsg1/stage0/2019-12-19/rust-std-1.40.0-mips64el-unknown-linux-gnuabi64.tar.xz differ
Binary files /tmp/Api9NwJhzB/rustc-1.41.1+dfsg1/stage0/2019-12-19/rust-std-1.40.0-mipsel-unknown-linux-gnu.tar.xz and /tmp/MF0ehsR9gE/rustc-1.41.1+dfsg1/stage0/2019-12-19/rust-std-1.40.0-mipsel-unknown-linux-gnu.tar.xz differ
Binary files /tmp/Api9NwJhzB/rustc-1.41.1+dfsg1/stage0/2019-12-19/rust-std-1.40.0-mips-unknown-linux-gnu.tar.xz and /tmp/MF0ehsR9gE/rustc-1.41.1+dfsg1/stage0/2019-12-19/rust-std-1.40.0-mips-unknown-linux-gnu.tar.xz differ
Binary files /tmp/Api9NwJhzB/rustc-1.41.1+dfsg1/stage0/2019-12-19/rust-std-1.40.0-powerpc64le-unknown-linux-gnu.tar.xz and /tmp/MF0ehsR9gE/rustc-1.41.1+dfsg1/stage0/2019-12-19/rust-std-1.40.0-powerpc64le-unknown-linux-gnu.tar.xz differ
Binary files /tmp/Api9NwJhzB/rustc-1.41.1+dfsg1/stage0/2019-12-19/rust-std-1.40.0-s390x-unknown-linux-gnu.tar.xz and /tmp/MF0ehsR9gE/rustc-1.41.1+dfsg1/stage0/2019-12-19/rust-std-1.40.0-s390x-unknown-linux-gnu.tar.xz differ
Binary files /tmp/Api9NwJhzB/rustc-1.41.1+dfsg1/stage0/2019-12-19/rust-std-1.40.0-x86_64-unknown-linux-gnu.tar.xz and /tmp/MF0ehsR9gE/rustc-1.41.1+dfsg1/stage0/2019-12-19/rust-std-1.40.0-x86_64-unknown-linux-gnu.tar.xz differ
--- End Message ---