Date: Sat, 16 Nov 2019 22:37:54 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r517780 - head/lang/rust-nightly/files Message-ID: <201911162237.xAGMbs77089232@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Sat Nov 16 22:37:54 2019 New Revision: 517780 URL: https://svnweb.freebsd.org/changeset/ports/517780 Log: lang/rust-nightly: unbreak with PYTHON_DEFAULT != 2.7 after r517551 =======================<phase: build >============================ ===> Building for rust-nightly-1.41.0.20191114 cd /wrkdirs/usr/ports/lang/rust-nightly/work/rustc-nightly-src && /usr/bin/env HOME="/wrkdirs/usr/ports/lang/rust-nightly/work" LIBGIT2_SYS_USE_PKG_CONFIG=1 LIBSSH2_SYS_USE_PKG_CONFIG=1 OPENSSL_DIR="/usr" /usr/local/bin/python3.6 /wrkdirs/usr/ports/lang/rust-nightly/work/rustc-nightly-src/x.py build --verbose --config ./config.toml --jobs 1 downloading https://static.rust-lang.org/dist/2019-11-06/rust-std-beta-x86_64-unknown-freebsd.tar.xz.sha256 running: curl -# -y 30 -Y 10 --connect-timeout 30 --retry 3 -Sf -o /tmp/tmpp0anpd14.sha256 https://static.rust-lang.org/dist/2019-11-06/rust-std-beta-x86_64-unknown-freebsd.tar.xz.sha256 curl: (7) Couldn't connect to server Reported by: pkg-fallout Added: head/lang/rust-nightly/files/patch-src_bootstrap_bootstrap.py (contents, props changed) Added: head/lang/rust-nightly/files/patch-src_bootstrap_bootstrap.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/rust-nightly/files/patch-src_bootstrap_bootstrap.py Sat Nov 16 22:37:54 2019 (r517780) @@ -0,0 +1,23 @@ +Disable https://github.com/rust-lang/rust/commit/8d56bcc59c92 until +master port drops Python 2.x support. + +--- src/bootstrap/bootstrap.py.orig 2019-11-13 20:12:18 UTC ++++ src/bootstrap/bootstrap.py +@@ -360,7 +360,7 @@ class RustBuild(object): + self.program_out_of_date(self.rustc_stamp())): + if os.path.exists(self.bin_root()): + shutil.rmtree(self.bin_root()) +- tarball_suffix = '.tar.xz' if support_xz() else '.tar.gz' ++ tarball_suffix = '.tar.gz' + filename = "rust-std-{}-{}{}".format( + rustc_channel, self.build, tarball_suffix) + pattern = "rust-std-{}".format(self.build) +@@ -385,7 +385,7 @@ class RustBuild(object): + if self.cargo().startswith(self.bin_root()) and \ + (not os.path.exists(self.cargo()) or + self.program_out_of_date(self.cargo_stamp())): +- tarball_suffix = '.tar.xz' if support_xz() else '.tar.gz' ++ tarball_suffix = '.tar.gz' + filename = "cargo-{}-{}{}".format(cargo_channel, self.build, + tarball_suffix) + self._download_stage0_helper(filename, "cargo", tarball_suffix)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201911162237.xAGMbs77089232>