svn commit: r489132 - head/lang/rust-nightly

Jan Beich jbeich at FreeBSD.org
Thu Jan 3 04:26:08 UTC 2019


Author: jbeich
Date: Thu Jan  3 04:26:07 2019
New Revision: 489132
URL: https://svnweb.freebsd.org/changeset/ports/489132

Log:
  lang/rust-nightly: skip optional tools on bustage
  
  As r488649 and r489131 have shown upstream doesn't block Nightly
  updates on errors in optional components. Do the same to avoid lagging
  behind updates or the package disappearing due to undertesting.
  
  src/bootstrap/dist.rs
  1150:        }).or_else(|| { missing_tool("RLS", builder.build.config.missing_tools); None })?;
  1229:        }).or_else(|| { missing_tool("clippy", builder.build.config.missing_tools); None })?;
  1233:        }).or_else(|| { missing_tool("cargo clippy", builder.build.config.missing_tools); None })?;
  1310:        }).or_else(|| { missing_tool("Rustfmt", builder.build.config.missing_tools); None })?;
  1314:        }).or_else(|| { missing_tool("Cargofmt", builder.build.config.missing_tools); None })?;

Modified:
  head/lang/rust-nightly/Makefile   (contents, props changed)

Modified: head/lang/rust-nightly/Makefile
==============================================================================
--- head/lang/rust-nightly/Makefile	Thu Jan  3 03:49:57 2019	(r489131)
+++ head/lang/rust-nightly/Makefile	Thu Jan  3 04:26:07 2019	(r489132)
@@ -33,4 +33,10 @@ nightly-post-patch:
 # https://github.com/rust-lang/rust/pull/57184
 	@${REINPLACE_CMD} '/RUSTC_DENY_WARNINGS/d' ${WRKSRC}/src/bootstrap/builder.rs
 
+post-configure:	nightly-post-configure
+nightly-post-configure:
+# Don't abort if optional tools fail to build
+# https://github.com/rust-lang/rust/commit/53254a888b42
+	@${ECHO_CMD} 'missing-tools = true' >>${WRKSRC}/config.toml
+
 .include "${MASTERDIR}/Makefile"


More information about the svn-ports-all mailing list