Date: Mon, 20 Jul 2020 17:52:06 +0000 (UTC) From: Tobias Kortkamp <tobik@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r542658 - head/lang/rust-nightly/files Message-ID: <202007201752.06KHq6p6046522@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tobik Date: Mon Jul 20 17:52:06 2020 New Revision: 542658 URL: https://svnweb.freebsd.org/changeset/ports/542658 Log: lang/rust-nightly: Unbreak build RLS is broken in nightly-2020-07-18 but that should not have aborted the package build. Add a workaround for the dist.missing-tools with build.tools bug. https://github.com/rust-lang/rust/issues/74545 Added: head/lang/rust-nightly/files/patch-src_bootstrap_install.rs (contents, props changed) Added: head/lang/rust-nightly/files/patch-src_bootstrap_install.rs ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/rust-nightly/files/patch-src_bootstrap_install.rs Mon Jul 20 17:52:06 2020 (r542658) @@ -0,0 +1,20 @@ +https://github.com/rust-lang/rust/issues/74545 + +--- src/bootstrap/install.rs.orig 2020-07-20 14:00:24 UTC ++++ src/bootstrap/install.rs +@@ -112,9 +112,14 @@ fn install_sh( + pkgname(builder, name) + }; + ++ let install_script = tmpdir(builder).join(&package_name).join("install.sh"); ++ if !install_script.exists() { ++ return; ++ } ++ + let mut cmd = Command::new("sh"); + cmd.current_dir(&empty_dir) +- .arg(sanitize_sh(&tmpdir(builder).join(&package_name).join("install.sh"))) ++ .arg(sanitize_sh(&install_script)) + .arg(format!("--prefix={}", sanitize_sh(&prefix))) + .arg(format!("--sysconfdir={}", sanitize_sh(&sysconfdir))) + .arg(format!("--datadir={}", sanitize_sh(&datadir)))
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202007201752.06KHq6p6046522>