Pre-import changes for 1.21

diff --git a/debian/README.source b/debian/README.source
index 7ca98f0a297f35f59e1ee22aec69ea74ceaf3f0e..e8028081795fd7f6a955a375045b824b4509c2a6 100644 (file)
--- a/debian/README.source
+++ b/debian/README.source
@@ -13,6 +13,7 @@ Import of a new upstream version
 $ uscan --verbose
 $ ver=UPDATE-ME # whatever it is, X.YY.0 probably
 $ tar xf ../rustc-$ver-src.tar.gz && ( cd rustc-$ver-src/ && ../debian/prune-unused-deps ) && rm -rf rustc-$ver-src/
+# ^ If this fails, you probably need to refresh patches or edit debian/prune-unused-deps
 $ git commit -m "Update Files-Excluded for new upstream version $ver" debian/copyright
 $ uscan --verbose # yes, again, to pick up the new Files-Excluded stuff
 
@@ -25,6 +26,7 @@ $ find . -type f -and -not -name '.cargo-checksum.json' -exec file '{}' \; | \
     grep -v '\b\(text\|empty\)\b' || true
 $ find src/vendor/ -name '*.c' -o -name '*.js'
 $ suspicious-source
+# When you are satisfied with the above, proceed:
 
 $ gbp import-orig ../rustc_$ver+dfsg1.orig.tar.xz
 $ dch -v $ver+dfsg1-1 -m "New upstream release."

diff --git a/debian/config.toml.in b/debian/config.toml.in
index 20ef06c42085f38cf5c50883f6d45adf7d92a7b3..54acd0c60fadb4ee32a33f14e4912c70ccb50282 100644 (file)
--- a/debian/config.toml.in
+++ b/debian/config.toml.in
@@ -26,11 +26,8 @@ llvm-config = "LLVM_DESTDIR/usr/lib/llvm-LLVM_VERSION/bin/llvm-config"
 
 )dnl
 [llvm]
-link-shared = true
 
 [rust]
-dist-src = false
-
 channel = "RELEASE_CHANNEL"
 
 # parallel codegen interferes with reproducibility, see

diff --git a/debian/patches/d-ignore-removed-submodules.patch b/debian/patches/d-ignore-removed-submodules.patch
index cd71a7643b0838cbdadc45db10e2f45e74049d66..48c3c2f6bce11b9f808447599b92703878ada4b5 100644 (file)
--- a/debian/patches/d-ignore-removed-submodules.patch
+++ b/debian/patches/d-ignore-removed-submodules.patch
@@ -3,11 +3,13 @@ Author: Ximin Luo <infinity0@debian.org>
 Forwarded: not-needed
 --- a/src/Cargo.toml
 +++ b/src/Cargo.toml
-@@ -15,7 +15,6 @@
+@@ -15,9 +15,7 @@
    "tools/remote-test-client",
    "tools/remote-test-server",
    "tools/rust-installer",
 -  "tools/cargo",
+   "tools/rustdoc",
+-  "tools/rls",
  ]
  
  # Curiously, compiletest will segfault if compiled with opt-level=3 on 64-bit
@@ -24,8 +26,8 @@ Forwarded: not-needed
          run(args, env=env, verbose=self.verbose)
  
      def build_triple(self):
---- a/src/bootstrap/lib.rs
-+++ b/src/bootstrap/lib.rs
+--- a/src/bootstrap/builder.rs
++++ b/src/bootstrap/builder.rs
 @@ -513,10 +513,7 @@
          if self.config.rust_optimize && cmd != "bench" {
              cargo.arg("--release");

diff --git a/debian/prune-unused-deps b/debian/prune-unused-deps
index 5ef7d92469ad6c03e0cac9406c6230ab5f6e6240..c570e66aa298f0774be4f4a2b4340b0039d8ba9c 100755 (executable)
--- a/debian/prune-unused-deps
+++ b/debian/prune-unused-deps
@@ -8,7 +8,14 @@ scriptdir=$(dirname "$(dirname "$(readlink -f "$0")")")
 had_configure_upstream=$(if test -e "$scriptdir/debian/configure-upstream"; then echo true; else echo false; fi)
 ( cd "$scriptdir" && debian/rules debian/configure-upstream )
 
+temporary_patches() {
+       # pre-patch Cargo.toml to remove hacky workarounds in 1.21 that won't be there in 1.22
+       # saves us time having to refresh then unrefresh the patch
+       sed -i -e '\,tools/rls/test_data,d' -e /FIXME/d src/Cargo.toml
+}
+
 "$scriptdir/debian/configure-upstream"
+temporary_patches
 "$scriptdir/debian/ensure-patch" -N "$scriptdir/debian/patches/d-ignore-removed-submodules.patch"
 test -f src/Cargo.lock.orig || cp src/Cargo.lock src/Cargo.lock.orig
 ./x.py build nonexistent/path/to/trigger/cargo/metadata src/bootstrap