Changeset View
Changeset View
Standalone View
Standalone View
head/lang/rust/files/patch-src_bootstrap_bootstrap.py
| Property | Old Value | New Value |
|---|---|---|
| fbsd:nokeywords | null | yes \ No newline at end of property |
| svn:eol-style | null | native \ No newline at end of property |
| svn:mime-type | null | text/plain \ No newline at end of property |
| https://github.com/rust-lang/rust/commit/8d56bcc59c92 | |||||
| --- src/bootstrap/bootstrap.py.orig 2019-11-04 15:45:21 UTC | |||||
| +++ src/bootstrap/bootstrap.py | |||||
| @@ -102,10 +102,10 @@ def verify(path, sha_path, verbose): | |||||
| return verified | |||||
| -def unpack(tarball, dst, verbose=False, match=None): | |||||
| +def unpack(tarball, tarball_suffix, dst, verbose=False, match=None): | |||||
| """Unpack the given tarball file""" | |||||
| print("extracting", tarball) | |||||
| - fname = os.path.basename(tarball).replace(".tar.gz", "") | |||||
| + fname = os.path.basename(tarball).replace(tarball_suffix, "") | |||||
| with contextlib.closing(tarfile.open(tarball)) as tar: | |||||
| for member in tar.getnames(): | |||||
| if "/" not in member: | |||||
| @@ -331,6 +331,18 @@ class RustBuild(object): | |||||
| self.use_vendored_sources = '' | |||||
| self.verbose = False | |||||
| + def support_xz(): | |||||
| + try: | |||||
| + with tempfile.NamedTemporaryFile(delete=False) as temp_file: | |||||
| + temp_path = temp_file.name | |||||
| + with tarfile.open(temp_path, "w:xz") as tar: | |||||
| + pass | |||||
| + return True | |||||
| + except tarfile.CompressionError: | |||||
| + return False | |||||
| + | |||||
| + self.tarball_suffix = '.tar.xz' if support_xz() else '.tar.gz' | |||||
| + | |||||
| def download_stage0(self): | |||||
| """Fetch the build system for Rust, written in Rust | |||||
| @@ -349,12 +361,13 @@ class RustBuild(object): | |||||
| self.program_out_of_date(self.rustc_stamp())): | |||||
| if os.path.exists(self.bin_root()): | |||||
| shutil.rmtree(self.bin_root()) | |||||
| - filename = "rust-std-{}-{}.tar.gz".format( | |||||
| - rustc_channel, self.build) | |||||
| + filename = "rust-std-{}-{}{}".format( | |||||
| + rustc_channel, self.build, self.tarball_suffix) | |||||
| pattern = "rust-std-{}".format(self.build) | |||||
| self._download_stage0_helper(filename, pattern) | |||||
| - filename = "rustc-{}-{}.tar.gz".format(rustc_channel, self.build) | |||||
| + filename = "rustc-{}-{}{}".format(rustc_channel, self.build, | |||||
| + self.tarball_suffix) | |||||
| self._download_stage0_helper(filename, "rustc") | |||||
| self.fix_executable("{}/bin/rustc".format(self.bin_root())) | |||||
| self.fix_executable("{}/bin/rustdoc".format(self.bin_root())) | |||||
| @@ -365,14 +378,15 @@ class RustBuild(object): | |||||
| # libraries/binaries that are included in rust-std with | |||||
| # the system MinGW ones. | |||||
| if "pc-windows-gnu" in self.build: | |||||
| - filename = "rust-mingw-{}-{}.tar.gz".format( | |||||
| - rustc_channel, self.build) | |||||
| + filename = "rust-mingw-{}-{}{}".format( | |||||
| + rustc_channel, self.build, self.tarball_suffix) | |||||
| self._download_stage0_helper(filename, "rust-mingw") | |||||
| if self.cargo().startswith(self.bin_root()) and \ | |||||
| (not os.path.exists(self.cargo()) or | |||||
| self.program_out_of_date(self.cargo_stamp())): | |||||
| - filename = "cargo-{}-{}.tar.gz".format(cargo_channel, self.build) | |||||
| + filename = "cargo-{}-{}{}".format(cargo_channel, self.build, | |||||
| + self.tarball_suffix) | |||||
| self._download_stage0_helper(filename, "cargo") | |||||
| self.fix_executable("{}/bin/cargo".format(self.bin_root())) | |||||
| with output(self.cargo_stamp()) as cargo_stamp: | |||||
| @@ -388,7 +402,7 @@ class RustBuild(object): | |||||
| tarball = os.path.join(rustc_cache, filename) | |||||
| if not os.path.exists(tarball): | |||||
| get("{}/{}".format(url, filename), tarball, verbose=self.verbose) | |||||
| - unpack(tarball, self.bin_root(), match=pattern, verbose=self.verbose) | |||||
| + unpack(tarball, self.tarball_suffix, self.bin_root(), match=pattern, verbose=self.verbose) | |||||
| @staticmethod | |||||
| def fix_executable(fname): | |||||