From ca8eb766aa836b88b5220a094b6462f0b27b776b Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Thu, 26 Oct 2023 15:48:28 +0800 Subject: [PATCH] rust: Fix compile error if build dir and DL_DIR on separate filesystems The rust bootstrap downloads files into a "tmp" directory then moves the files into the "cache" directory using std::fs::rename. There are no issues in the original/unpatched case as "tmp" and "cache" are subdirectories in the build directory ($(HOST_BUILD_DIR)/build) and so are nearly guaranteed to be on the same filesystem. 35768bf31e5867046874dc6fd0374ff8fe575da2 changed where files are saved/cached (in $(DL_DIR)/rustc). If HOST_BUILD_DIR and DL_DIR are on separate filesystems, then using std::fs::rename to move the files will fail.[1] This updates 0002-rustc-bootstrap-cache.patch to account for this case, i.e. if std::fs::rename fails, fall back to copying the file then removing the original. [1]: https://github.com/openwrt/packages/pull/22457 Fixes: 35768bf31e58 ("rust: Cache bootstrap downloads to $(DL_DIR)/rustc") Signed-off-by: Jeffery To (cherry picked from commit f9f1e0220f872263d8f12c38df9984a40625430f) --- .../patches/0002-rustc-bootstrap-cache.patch | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/lang/rust/patches/0002-rustc-bootstrap-cache.patch b/lang/rust/patches/0002-rustc-bootstrap-cache.patch index 9f434fc8df..f3e814e8ff 100644 --- a/lang/rust/patches/0002-rustc-bootstrap-cache.patch +++ b/lang/rust/patches/0002-rustc-bootstrap-cache.patch @@ -11,7 +11,22 @@ os.makedirs(rustc_cache) --- a/src/bootstrap/download.rs +++ b/src/bootstrap/download.rs -@@ -520,7 +520,10 @@ impl Config { +@@ -202,7 +202,13 @@ impl Config { + Some(other) => panic!("unsupported protocol {other} in {url}"), + None => panic!("no protocol in {url}"), + } +- t!(std::fs::rename(&tempfile, dest_path)); ++ match std::fs::rename(&tempfile, dest_path) { ++ Ok(v) => v, ++ Err(_) => { ++ t!(std::fs::copy(&tempfile, dest_path)); ++ t!(std::fs::remove_file(&tempfile)); ++ } ++ } + } + + fn download_http_with_retries(&self, tempfile: &Path, url: &str, help_on_error: &str) { +@@ -520,7 +526,10 @@ impl Config { key: &str, destination: &str, ) { @@ -23,7 +38,7 @@ let cache_dir = cache_dst.join(key); if !cache_dir.exists() { t!(fs::create_dir_all(&cache_dir)); -@@ -647,7 +650,10 @@ download-rustc = false +@@ -647,7 +656,10 @@ download-rustc = false let llvm_assertions = self.llvm_assertions; let cache_prefix = format!("llvm-{llvm_sha}-{llvm_assertions}"); -- 2.30.2