From: Peter Michael Green <plugwash@raspbian.org>
Date: Tue, 17 Sep 2019 01:18:17 +0000 (+0000)
Subject: Manual merge of version 1.35.0+dfsg1-1+rpi1 and 1.37.0+dfsg1-1 to produce 1.37.0... 
X-Git-Tag: archive/raspbian/1.39.0+dfsg1-4+rpi1~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=429ee00e6d8e79b1a14f56e5e9d1fc6e00e9a955;p=rustc.git

Manual merge of version 1.35.0+dfsg1-1+rpi1 and 1.37.0+dfsg1-1 to produce 1.37.0+dfsg1-1+rpi1
---

429ee00e6d8e79b1a14f56e5e9d1fc6e00e9a955
diff --cc debian/changelog
index dd838ad92c,2692d811b0..517d6ec5fb
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,45 +1,54 @@@
- rustc (1.35.0+dfsg1-1+rpi1) bullseye-staging; urgency=medium
++rustc (1.37.0+dfsg1-1+rpi1) bullseye-staging; urgency=medium
 +
 +  [changes brought forward from 1.15.1+dfsg1-1~exp3+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 15 Mar 2017 10:16:18 +0000]
 +  * Build for armv6.
 +  [changes introduced in 1.18.0+dfsg1-4+rpi1 by Peter Michael Green]
 +  * Disable testsuite.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 12 Sep 2019 22:49:59 +0000
++ -- Peter Micheal Green <plugwash@raspbian.org>  Tue, 17 Sep 2019 01:17:52 +0000
++
+ rustc (1.37.0+dfsg1-1) unstable; urgency=medium
+ 
+   * Upload to unstable.
+   * Fix a typo in debian/rules regex causing FTBFS on some arches.
+ 
+  -- Ximin Luo <infinity0@debian.org>  Thu, 05 Sep 2019 00:06:23 -0700
+ 
+ rustc (1.37.0+dfsg1-1~exp2) experimental; urgency=medium
+ 
+   * Support cross-compiling to wasm32. (Closes: #903110)
+     To do that, install the libstd-rust-dev-wasm32-cross package and give
+     --target wasm32-unknown-unknown.
+   * Drop dependency on system compiler-rt, these new versions of rustc
+     actually don't need it at all.
+ 
+  -- Ximin Luo <infinity0@debian.org>  Thu, 29 Aug 2019 09:00:03 -0700
+ 
+ rustc (1.37.0+dfsg1-1~exp1) experimental; urgency=medium
+ 
+   * New upstream release.
+   * Use system compiler-rt.
+ 
+  -- Ximin Luo <infinity0@debian.org>  Sun, 25 Aug 2019 03:06:33 -0700
+ 
+ rustc (1.36.0+dfsg1-2) unstable; urgency=medium
+ 
+   * Set CARGO_HOME to debian/cargo_home (instead of $HOME/.cargo) as newer
+     versions of cargo must take a file lock that has to exist.
+ 
+  -- Ximin Luo <infinity0@debian.org>  Wed, 17 Jul 2019 18:25:06 -0700
+ 
+ rustc (1.36.0+dfsg1-1) unstable; urgency=medium
+ 
+   * Upload to unstable.
+ 
+  -- Ximin Luo <infinity0@debian.org>  Tue, 16 Jul 2019 20:27:55 -0700
+ 
+ rustc (1.36.0+dfsg1-1~exp1) experimental; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Ximin Luo <infinity0@debian.org>  Sat, 13 Jul 2019 12:42:05 -0700
  
  rustc (1.35.0+dfsg1-1) unstable; urgency=medium
  
diff --cc debian/rules
index 97d39b2117,178afb1be7..8b471bdb69
--- a/debian/rules
+++ b/debian/rules
@@@ -230,8 -233,10 +233,10 @@@ override_dh_auto_test-arch
  		test "$$(stat -c %s "$$x")" -lt 6000000; \
  	done
  ifeq (, $(filter nocheck,$(DEB_BUILD_PROFILES)))
 -ifeq (, $(filter nocheck,$(DEB_BUILD_OPTIONS)))
 +ifeq (testsuitedisabled, $(filter nocheck,$(DEB_BUILD_OPTIONS)))
- 	{ $(RUSTBUILD_TEST) --no-fail-fast $(RUSTBUILD_FLAGS) $(RUSTBUILD_TEST_FLAGS); echo $$?; } | tee -a $(TEST_LOG)
+ 	# TODO: eventually, drop --target $(DEB_HOST_RUST_TYPE) and run tests for
+ 	# all targets including e.g. wasm32-unknown-unknown
+ 	{ $(RUSTBUILD_TEST) --no-fail-fast --target $(DEB_HOST_RUST_TYPE) $(RUSTBUILD_FLAGS) $(RUSTBUILD_TEST_FLAGS); echo $$?; } | tee -a $(TEST_LOG)
  	# test that the log has at least 1 pass, to prevent e.g. #57709
  	grep -l "^test .* \.\.\. ok$$" $(TEST_LOG)
  	echo "==== Debian rustc test report ===="; \