Skip to content

Commit 6b6c74d

Browse files
feckertfeckert
committed
rust: add patch to fix remote filesystem issue
If the download directory is on another filesystem (NFS), then the current implementation of bootstrapping rust fails. Because the 'syscall' (rename) does not work on crossing filesystem boundary. This chnage was already merged upstream to the github main rust repository. rust-lang/rust#124975 The patch has been rebased so that it can be applied correctly. No functional change. Signed-off-by: Florian Eckert <[email protected]>
1 parent 77130df commit 6b6c74d

File tree

2 files changed

+109
-1
lines changed

2 files changed

+109
-1
lines changed

‎lang/rust/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
66

77
PKG_NAME:=rust
88
PKG_VERSION:=1.78.0
9-
PKG_RELEASE:=1
9+
PKG_RELEASE:=2
1010

1111
PKG_SOURCE:=rustc-$(PKG_VERSION)-src.tar.gz
1212
PKG_SOURCE_URL:=https://static.rust-lang.org/dist/

‎lang/rust/patches/0004-Use-an-helper-to-move-the-files.patch

+108
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,108 @@
1+
From 4db00fe229f08b06feeee552ae53af9f49c25048 Mon Sep 17 00:00:00 2001
2+
From: Luca Barbato <[email protected]>
3+
Date: Fri, 10 May 2024 16:38:19 +0200
4+
Subject: [PATCH] Use an helper to move the files
5+
6+
In case the source is not in the same filesystem.
7+
---
8+
src/bootstrap/src/core/build_steps/dist.rs | 6 ++++--
9+
src/bootstrap/src/core/download.rs | 6 +++---
10+
src/bootstrap/src/utils/helpers.rs | 15 +++++++++++++++
11+
src/bootstrap/src/utils/tarball.rs | 4 ++--
12+
4 files changed, 24 insertions(+), 7 deletions(-)
13+
14+
--- a/src/bootstrap/src/core/build_steps/dist.rs
15+
+++ b/src/bootstrap/src/core/build_steps/dist.rs
16+
@@ -26,7 +26,9 @@ use crate::core::build_steps::tool::{sel
17+
use crate::core::builder::{Builder, Kind, RunConfig, ShouldRun, Step};
18+
use crate::core::config::TargetSelection;
19+
use crate::utils::channel;
20+
-use crate::utils::helpers::{exe, is_dylib, output, t, target_supports_cranelift_backend, timeit};
21+
+use crate::utils::helpers::{
22+
+ exe, is_dylib, move_file, output, t, target_supports_cranelift_backend, timeit,
23+
+};
24+
use crate::utils::tarball::{GeneratedTarball, OverlayKind, Tarball};
25+
use crate::{Compiler, DependencyType, Mode, LLVM_TOOLS};
26+
27+
@@ -1993,7 +1995,7 @@ impl Step for Extended {
28+
builder.run(&mut cmd);
29+
30+
if !builder.config.dry_run() {
31+
- t!(fs::rename(exe.join(&filename), distdir(builder).join(&filename)));
32+
+ t!(move_file(exe.join(&filename), distdir(builder).join(&filename)));
33+
}
34+
}
35+
}
36+
--- a/src/bootstrap/src/core/download.rs
37+
+++ b/src/bootstrap/src/core/download.rs
38+
@@ -12,7 +12,7 @@ use build_helper::ci::CiEnv;
39+
use xz2::bufread::XzDecoder;
40+
41+
use crate::core::config::RustfmtMetadata;
42+
-use crate::utils::helpers::{check_run, exe, program_out_of_date};
43+
+use crate::utils::helpers::{check_run, exe, move_file, program_out_of_date};
44+
use crate::{core::build_steps::llvm::detect_llvm_sha, utils::helpers::hex_encode};
45+
use crate::{t, Config};
46+
47+
@@ -209,7 +209,7 @@ impl Config {
48+
None => panic!("no protocol in {url}"),
49+
}
50+
t!(
51+
- std::fs::rename(&tempfile, dest_path),
52+
+ move_file(&tempfile, dest_path),
53+
format!("failed to rename {tempfile:?} to {dest_path:?}")
54+
);
55+
}
56+
@@ -313,7 +313,7 @@ impl Config {
57+
if src_path.is_dir() && dst_path.exists() {
58+
continue;
59+
}
60+
- t!(fs::rename(src_path, dst_path));
61+
+ t!(move_file(src_path, dst_path));
62+
}
63+
let dst_dir = dst.join(directory_prefix);
64+
if dst_dir.exists() {
65+
--- a/src/bootstrap/src/utils/helpers.rs
66+
+++ b/src/bootstrap/src/utils/helpers.rs
67+
@@ -150,6 +150,21 @@ pub fn symlink_dir(config: &Config, orig
68+
}
69+
}
70+
71+
+/// Rename a file if from and to are in the same filesystem or
72+
+/// copy and remove the file otherwise
73+
+pub fn move_file<P: AsRef<Path>, Q: AsRef<Path>>(from: P, to: Q) -> io::Result<()> {
74+
+ match fs::rename(&from, &to) {
75+
+ // FIXME: Once `ErrorKind::CrossesDevices` is stabilized use
76+
+ // if e.kind() == io::ErrorKind::CrossesDevices {
77+
+ #[cfg(unix)]
78+
+ Err(e) if e.raw_os_error() == Some(libc::EXDEV) => {
79+
+ std::fs::copy(&from, &to)?;
80+
+ std::fs::remove_file(&from)
81+
+ }
82+
+ r => r,
83+
+ }
84+
+}
85+
+
86+
pub fn forcing_clang_based_tests() -> bool {
87+
if let Some(var) = env::var_os("RUSTBUILD_FORCE_CLANG_BASED_TESTS") {
88+
match &var.to_string_lossy().to_lowercase()[..] {
89+
--- a/src/bootstrap/src/utils/tarball.rs
90+
+++ b/src/bootstrap/src/utils/tarball.rs
91+
@@ -6,7 +6,7 @@ use std::{
92+
use crate::core::builder::Builder;
93+
use crate::core::{build_steps::dist::distdir, builder::Kind};
94+
use crate::utils::channel;
95+
-use crate::utils::helpers::t;
96+
+use crate::utils::helpers::{move_file, t};
97+
98+
#[derive(Copy, Clone)]
99+
pub(crate) enum OverlayKind {
100+
@@ -269,7 +269,7 @@ impl<'a> Tarball<'a> {
101+
// name, not "image". We rename the image directory just before passing
102+
// into rust-installer.
103+
let dest = self.temp_dir.join(self.package_name());
104+
- t!(std::fs::rename(&self.image_dir, &dest));
105+
+ t!(move_file(&self.image_dir, &dest));
106+
107+
self.run(|this, cmd| {
108+
let distdir = distdir(this.builder);

0 commit comments

Comments
 (0)