rebase of the patches

debian/changelog

@@ -1,6 +1,7 @@
 rustc (1.16.0+dfsg1-1~exp1) experimental; urgency=medium
 
-  * New upstream erlease
+  * New upstream release
+  * u-ignoretest-jemalloc.patch removed (applied upstream)
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Fri, 17 Mar 2017 10:33:46 +0100
 

debian/patches/d-add-soname.patch

@@ -18,11 +18,11 @@ Description: Set DT_SONAME when building dylibs
 Author: Angus Lees <gus@debian.org>
 Forwarded: no
 
-Index: rustc.git/src/librustc_trans/back/link.rs
+Index: rust/src/librustc_trans/back/link.rs
 ===================================================================
---- rustc.git.orig/src/librustc_trans/back/link.rs
-+++ rustc.git/src/librustc_trans/back/link.rs
-@@ -895,6 +895,13 @@ fn link_args(cmd: &mut Linker,
+--- rust.orig/src/librustc_trans/back/link.rs
++++ rust/src/librustc_trans/back/link.rs
+@@ -927,6 +927,13 @@ fn link_args(cmd: &mut Linker,
          cmd.args(&rpath::get_rpath_flags(&mut rpath_config));
      }
  

debian/patches/d-dynamic-link-llvm.patch

@@ -9,11 +9,11 @@ Author: Ximin Luo <infinity0@debian.org>
 Forwarded: not-needed
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: rustc.git/src/librustc_llvm/build.rs
+Index: rust/src/librustc_llvm/build.rs
 ===================================================================
---- rustc.git.orig/src/librustc_llvm/build.rs
-+++ rustc.git/src/librustc_llvm/build.rs
-@@ -157,55 +157,10 @@ fn main() {
+--- rust.orig/src/librustc_llvm/build.rs
++++ rust/src/librustc_llvm/build.rs
+@@ -158,55 +158,10 @@ fn main() {
  
      let (llvm_kind, llvm_link_arg) = detect_llvm_link(&llvm_config);
  
@@ -73,10 +73,10 @@ Index: rustc.git/src/librustc_llvm/build.rs
  
      // LLVM ldflags
      //
-Index: rustc.git/src/etc/mklldeps.py
+Index: rust/src/etc/mklldeps.py
 ===================================================================
---- rustc.git.orig/src/etc/mklldeps.py
-+++ rustc.git/src/etc/mklldeps.py
+--- rust.orig/src/etc/mklldeps.py
++++ rust/src/etc/mklldeps.py
 @@ -56,38 +56,13 @@ def runErr(args):
  
  f.write("\n")

debian/patches/series

@@ -9,10 +9,9 @@ u-ignoretest-armhf_04.patch
 u-ignoretest-arm64-stdcall.patch
 #u-ignoretest-i386.patch
 u-ignoretest-arm64.patch
-u-ignoretest-jemalloc.patch
 u-detect-mips-cpu.patch
 u-ignoretest-powerpc.patch
-u-destdir-support.diff
+#u-destdir-support.diff
 u-arm-on-64bit-kernel.diff
 
 # Debian-specific patches, not suitable for upstream

debian/patches/u-arm-on-64bit-kernel.diff

@@ -3,10 +3,10 @@ Author: Matthias Klose <doko@debian.org>
 Applied-Upstream: commit:0a55c8e659f0fc540b740101f7a02ab28e300aa4
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: b/configure
+Index: rust/configure
 ===================================================================
---- a/configure
-+++ b/configure
+--- rust.orig/configure
++++ rust/configure
 @@ -513,7 +513,7 @@ case $CFG_CPUTYPE in
          CFG_OSTYPE="${CFG_OSTYPE}eabihf"
          ;;
@@ -16,11 +16,11 @@ Index: b/configure
          CFG_CPUTYPE=armv7
          CFG_OSTYPE="${CFG_OSTYPE}eabihf"
          ;;
-Index: b/src/bootstrap/bootstrap.py
+Index: rust/src/bootstrap/bootstrap.py
 ===================================================================
---- a/src/bootstrap/bootstrap.py
-+++ b/src/bootstrap/bootstrap.py
-@@ -372,7 +372,7 @@ class RustBuild(object):
+--- rust.orig/src/bootstrap/bootstrap.py
++++ rust/src/bootstrap/bootstrap.py
+@@ -374,7 +374,7 @@ class RustBuild(object):
              cputype = 'i686'
          elif cputype in {'xscale', 'arm'}:
              cputype = 'arm'

debian/patches/u-detect-mips-cpu.patch

@@ -5,9 +5,11 @@ Author: Ximin Luo <infinity0@debian.org>
 Bug: https://github.com/rust-lang/rust/pull/38650
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/configure
-+++ b/configure
-@@ -388,6 +388,7 @@
+Index: rust/configure
+===================================================================
+--- rust.orig/configure
++++ rust/configure
+@@ -388,6 +388,7 @@ msg "inspecting environment"
  
  CFG_OSTYPE=$(uname -s)
  CFG_CPUTYPE=$(uname -m)
@@ -15,10 +17,14 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  
  if [ $CFG_OSTYPE = Darwin -a $CFG_CPUTYPE = i386 ]
  then
-@@ -541,6 +542,17 @@
-         CFG_CPUTYPE=x86_64
-         ;;
- 
+@@ -549,6 +550,17 @@ case $CFG_CPUTYPE in
+         if [ "$ENDIAN" -eq 1 ]; then
+             CFG_CPUTYPE="${CFG_CPUTYPE}el"
+         elif [ "$ENDIAN" -ne 256 ]; then
++            err "unknown endianness: $ENDIAN (expecting 1 for little or 256 for big)"
++        fi
++        ;;
++
 +    mips | mips64)
 +        if [ "$CFG_CPUTYPE" = "mips64" ]; then
 +            CFG_OSTYPE="${CFG_OSTYPE}abi64"
@@ -26,17 +32,15 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 +        if [ "$ENDIAN" -eq 1 ]; then
 +            CFG_CPUTYPE="${CFG_CPUTYPE}el"
 +        elif [ "$ENDIAN" -ne 256 ]; then
-+            err "unknown endianness: $ENDIAN (expecting 1 for little or 256 for big)"
-+        fi
-+        ;;
-+
-     BePC)
-         CFG_CPUTYPE=i686
+             err "unknown endianness: $ENDIAN (expecting 1 for little or 256 for big)"
+         fi
          ;;
---- a/src/test/run-pass/conditional-compile-arch.rs
-+++ b/src/test/run-pass/conditional-compile-arch.rs
-@@ -22,6 +22,12 @@
- #[cfg(target_arch = "aarch64")]
+Index: rust/src/test/run-pass/conditional-compile-arch.rs
+===================================================================
+--- rust.orig/src/test/run-pass/conditional-compile-arch.rs
++++ rust/src/test/run-pass/conditional-compile-arch.rs
+@@ -28,6 +28,12 @@ pub fn main() { }
+ #[cfg(target_arch = "mips64")]
  pub fn main() { }
  
 +#[cfg(target_arch = "mips")]

debian/patches/u-ignoretest-arm64.patch

@@ -1,12 +1,12 @@
-Index: rustc.git/src/test/run-pass-valgrind/down-with-thread-dtors.rs
+Index: rust/src/test/run-pass-valgrind/down-with-thread-dtors.rs
 ===================================================================
---- rustc.git.orig/src/test/run-pass-valgrind/down-with-thread-dtors.rs
-+++ rustc.git/src/test/run-pass-valgrind/down-with-thread-dtors.rs
+--- rust.orig/src/test/run-pass-valgrind/down-with-thread-dtors.rs
++++ rust/src/test/run-pass-valgrind/down-with-thread-dtors.rs
 @@ -8,6 +8,7 @@
  // option. This file may not be copied, modified, or distributed
  // except according to those terms.
  
 +// ignore-aarch64
  // no-prefer-dynamic
+ // ignore-emscripten
  
- thread_local!(static FOO: Foo = Foo);

debian/patches/u-ignoretest-jemalloc.patch

@@ -1,50 +0,0 @@
-Description: Disable jemalloc tests and on s390x
-Author: Ximin Luo <infinity0@debian.org>
-Applied-Upstream: commit:1a2ed98d344b6cbddc57db8841b42f935877e08d
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: rust/src/librustc_back/target/s390x_unknown_linux_gnu.rs
-===================================================================
---- rust.orig/src/librustc_back/target/s390x_unknown_linux_gnu.rs	2017-02-26 18:08:22.891629489 +0100
-+++ rust/src/librustc_back/target/s390x_unknown_linux_gnu.rs	2017-02-26 18:08:22.887629473 +0100
-@@ -19,6 +19,8 @@
-     // Pass the -vector feature string to LLVM to respect this assumption.
-     base.features = "-vector".to_string();
-     base.max_atomic_width = Some(64);
-+    // see #36994
-+    base.exe_allocation_crate = "alloc_system".to_string();
- 
-     Ok(Target {
-         llvm_target: "s390x-unknown-linux-gnu".to_string(),
-Index: rust/src/test/compile-fail/allocator-rust-dylib-is-jemalloc.rs
-===================================================================
---- rust.orig/src/test/compile-fail/allocator-rust-dylib-is-jemalloc.rs	2017-02-26 18:08:22.891629489 +0100
-+++ rust/src/test/compile-fail/allocator-rust-dylib-is-jemalloc.rs	2017-02-26 18:08:22.887629473 +0100
-@@ -29,9 +29,11 @@
- // ensure we get the same error.
- //
- // So long as we CI linux/OSX we should be good.
--#[cfg(any(target_os = "linux", target_os = "macos"))]
-+#[cfg(any(all(target_os = "linux", any(target_arch = "x86", target_arch = "x86_64")),
-+          target_os = "macos"))]
- extern crate alloc_system;
--#[cfg(not(any(target_os = "linux", target_os = "macos")))]
-+#[cfg(not(any(all(target_os = "linux", any(target_arch = "x86", target_arch = "x86_64")),
-+              target_os = "macos")))]
- extern crate allocator1;
- 
- fn main() {
-Index: rust/src/test/run-pass/allocator-default.rs
-===================================================================
---- rust.orig/src/test/run-pass/allocator-default.rs	2017-02-26 18:08:22.891629489 +0100
-+++ rust/src/test/run-pass/allocator-default.rs	2017-02-26 18:08:22.887629473 +0100
-@@ -10,7 +10,8 @@
- 
- #![feature(alloc_jemalloc)]
- 
--#[cfg(any(target_os = "linux", target_os = "macos"))]
-+#[cfg(any(all(target_os = "linux", any(target_arch = "x86", target_arch = "x86_64")),
-+          target_os = "macos"))]
- extern crate alloc_jemalloc;
- 
- fn main() {

debian/patches/u-ignoretest-powerpc.patch

@@ -2,68 +2,62 @@ Description: Ignore ASM tests on powerpc
 Author: Erwan Prioul <erwan@linux.vnet.ibm.com>
 Applied-Upstream: commit:1572bf104dbf65d58bd6b889fa46229c9b92d6f9
 
-diff -Naur a/src/test/compile-fail/asm-bad-clobber.rs b/src/test/compile-fail/asm-bad-clobber.rs
---- a/src/test/compile-fail/asm-bad-clobber.rs	2017-02-17 10:21:15.192001150 +0000
-+++ b/src/test/compile-fail/asm-bad-clobber.rs	2017-02-20 10:53:33.355996252 +0000
-@@ -12,6 +12,7 @@
- // ignore-arm
+Index: rust/src/test/compile-fail/asm-bad-clobber.rs
+===================================================================
+--- rust.orig/src/test/compile-fail/asm-bad-clobber.rs
++++ rust/src/test/compile-fail/asm-bad-clobber.rs
+@@ -13,6 +13,7 @@
  // ignore-aarch64
  // ignore-s390x
+ // ignore-emscripten
 +// ignore-powerpc
  
  #![feature(asm, rustc_attrs)]
  
-diff -Naur a/src/test/compile-fail/asm-in-bad-modifier.rs b/src/test/compile-fail/asm-in-bad-modifier.rs
---- a/src/test/compile-fail/asm-in-bad-modifier.rs	2017-02-17 10:21:15.040001150 +0000
-+++ b/src/test/compile-fail/asm-in-bad-modifier.rs	2017-02-20 10:53:55.139999754 +0000
-@@ -9,6 +9,7 @@
- // except according to those terms.
+Index: rust/src/test/compile-fail/asm-in-bad-modifier.rs
+===================================================================
+--- rust.orig/src/test/compile-fail/asm-in-bad-modifier.rs
++++ rust/src/test/compile-fail/asm-in-bad-modifier.rs
+@@ -10,6 +10,7 @@
  
  // ignore-s390x
+ // ignore-emscripten
 +// ignore-powerpc
  
  #![feature(asm)]
  
-diff -Naur a/src/test/compile-fail/asm-misplaced-option.rs b/src/test/compile-fail/asm-misplaced-option.rs
---- a/src/test/compile-fail/asm-misplaced-option.rs	2017-02-17 10:21:16.120001149 +0000
-+++ b/src/test/compile-fail/asm-misplaced-option.rs	2017-02-20 10:54:33.619839143 +0000
-@@ -12,6 +12,7 @@
- // ignore-arm
- // ignore-aarch64
- // ignore-s390x
-+// ignore-powerpc
- 
- #![feature(asm, rustc_attrs)]
- 
-diff -Naur a/src/test/compile-fail/asm-out-assign-imm.rs b/src/test/compile-fail/asm-out-assign-imm.rs
---- a/src/test/compile-fail/asm-out-assign-imm.rs	2017-02-17 10:21:14.804001149 +0000
-+++ b/src/test/compile-fail/asm-out-assign-imm.rs	2017-02-20 10:55:26.796023677 +0000
-@@ -9,6 +9,7 @@
- // except according to those terms.
+Index: rust/src/test/compile-fail/asm-out-assign-imm.rs
+===================================================================
+--- rust.orig/src/test/compile-fail/asm-out-assign-imm.rs
++++ rust/src/test/compile-fail/asm-out-assign-imm.rs
+@@ -10,6 +10,7 @@
  
  // ignore-s390x
+ // ignore-emscripten
 +// ignore-powerpc
  
  #![feature(asm)]
  
-diff -Naur a/src/test/compile-fail/asm-out-no-modifier.rs b/src/test/compile-fail/asm-out-no-modifier.rs
---- a/src/test/compile-fail/asm-out-no-modifier.rs	2017-02-17 10:21:12.548001149 +0000
-+++ b/src/test/compile-fail/asm-out-no-modifier.rs	2017-02-20 10:55:37.908025746 +0000
-@@ -9,6 +9,7 @@
- // except according to those terms.
+Index: rust/src/test/compile-fail/asm-out-no-modifier.rs
+===================================================================
+--- rust.orig/src/test/compile-fail/asm-out-no-modifier.rs
++++ rust/src/test/compile-fail/asm-out-no-modifier.rs
+@@ -10,6 +10,7 @@
  
  // ignore-s390x
+ // ignore-emscripten
 +// ignore-powerpc
  
  #![feature(asm)]
  
-diff -Naur a/src/test/compile-fail/asm-out-read-uninit.rs b/src/test/compile-fail/asm-out-read-uninit.rs
---- a/src/test/compile-fail/asm-out-read-uninit.rs	2017-02-17 10:21:12.968001149 +0000
-+++ b/src/test/compile-fail/asm-out-read-uninit.rs	2017-02-20 10:55:49.260001428 +0000
-@@ -9,6 +9,7 @@
- // except according to those terms.
+Index: rust/src/test/compile-fail/asm-out-read-uninit.rs
+===================================================================
+--- rust.orig/src/test/compile-fail/asm-out-read-uninit.rs
++++ rust/src/test/compile-fail/asm-out-read-uninit.rs
+@@ -10,6 +10,7 @@
  
  // ignore-s390x
+ // ignore-emscripten
 +// ignore-powerpc
  
  #![feature(asm)]

debian/patches/u-reproducible-dl-stage0.patch

@@ -1,19 +1,13 @@
-Description: Set the timestamp of downloaded stage0 files
- This allows make_orig-dl_tarball.sh to be reproducible
-Author: Ximin Luo <infinity0@debian.org>
-Forwarded: TODO
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: rustc.git/src/bootstrap/bootstrap.py
+Index: rust/src/bootstrap/bootstrap.py
 ===================================================================
---- rustc.git.orig/src/bootstrap/bootstrap.py
-+++ rustc.git/src/bootstrap/bootstrap.py
+--- rust.orig/src/bootstrap/bootstrap.py
++++ rust/src/bootstrap/bootstrap.py
 @@ -72,7 +72,7 @@ def download(path, url, probably_big, ve
              option = "-#"
          else:
              option = "-s"
--        run(["curl", option, "-Sf", "-o", path, url], verbose=verbose)
-+        run(["curl", "-R", option, "-Sf", "-o", path, url], verbose=verbose)
+-        run(["curl", option, "--retry", "3", "-Sf", "-o", path, url], verbose=verbose)
++        run(["curl", option, "-R", "--retry", "3", "-Sf", "-o", path, url], verbose=verbose)
  
  
  def verify(path, sha_path, verbose):