From owner-svn-ports-all@freebsd.org Sat Nov 16 22:37:55 2019 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3EE681AFA68; Sat, 16 Nov 2019 22:37:55 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47FqqQ6fk4z42Ft; Sat, 16 Nov 2019 22:37:54 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9013485DF; Sat, 16 Nov 2019 22:37:54 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xAGMbsZY089233; Sat, 16 Nov 2019 22:37:54 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xAGMbs77089232; Sat, 16 Nov 2019 22:37:54 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201911162237.xAGMbs77089232@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sat, 16 Nov 2019 22:37:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r517780 - head/lang/rust-nightly/files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: head/lang/rust-nightly/files X-SVN-Commit-Revision: 517780 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Nov 2019 22:37:55 -0000 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 =================================================== ===> 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)