From: Peter Michael Green <plugwash@raspbian.org>
Date: Wed, 5 Oct 2022 18:52:28 +0000 (+0000)
Subject: Disable mips symlinking code
X-Git-Tag: raspbian/1.59.0+dfsg1-1_deb11u3+rpi1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=53c6cae905bfafad35578ba7161527f8da1b2a95;p=rustc-mozilla.git

Disable mips symlinking code
---

diff --git a/debian/changelog b/debian/changelog
index 7e5b79243..a833806f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,12 +2,17 @@ rustc-mozilla (1.59.0+dfsg1-1~deb11u3+rpi1) bullseye-staging; urgency=medium
 
   [changes brought over from rustc 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 rustc 1.18.0+dfsg1-4+rpi1 by Peter Michael Green]
   * Disable testsuite.
+
   [changes introduced in rustc-mozilla 1.51.0+dfsg1-1~deb11u1+rpi1 by Peter Michael Green]
   * Force DEB_BUILD_RUST_TYPE to armv7-unknown-linux-gnueabih as that is what we have a stage0 compiler for.
   * Use DEB_BUILD_RUST_TYPE not DEB_HOST_RUST_TYPE when looking for a stage0 compiler.
 
+  [changes introduced in rustc-mozilla 1.59.0+dfsg1-1~deb11u3+rpi1 by Peter Michael Green]
+  * Disable mips symlinking code that is failing with a "file exists" error.
+
  -- Peter Michael Green <plugwash@raspbian.org>  Wed, 05 Oct 2022 00:15:26 +0000
 
 rustc-mozilla (1.59.0+dfsg1-1~deb11u3) bullseye; urgency=medium
diff --git a/debian/rules b/debian/rules
index d7030fe36..8175e330e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -234,12 +234,12 @@ debian/dh_auto_configure.stamp: debian/config.toml check-no-old-llvm
 	echo 'fn main() { println!("cargo:rustc-link-lib=lzma"); }' > vendor/lzma-sys/build.rs
 	# We don't run ./configure because we use debian/config.toml directly
 	ln -sf debian/config.toml config.toml
-	# set up links for the mips* tarballs, as bootstrap.py expects them in stage0/
-	for fmips in stage0-mips/*/*; do \
-		f0="`echo $$fmips | sed 's/stage0-mips/stage0/'`"; \
-		# we use a hardlink here, for some reason bootstrap.py doesn't like symlinks \
-		ln $$fmips $$f0; \
-	done
+	## set up links for the mips* tarballs, as bootstrap.py expects them in stage0/
+	#for fmips in stage0-mips/*/*; do \
+	#	f0="`echo $$fmips | sed 's/stage0-mips/stage0/'`"; \
+	#	# we use a hardlink here, for some reason bootstrap.py doesn't like symlinks \
+	#	ln $$fmips $$f0; \
+	#done
 	touch "$@"
 
 override_dh_auto_configure-arch: debian/dh_auto_configure.stamp