Date: Fri, 24 May 2019 05:58:29 +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: r502420 - head/lang/rust-nightly/files Message-ID: <201905240558.x4O5wT3I037390@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tobik Date: Fri May 24 05:58:28 2019 New Revision: 502420 URL: https://svnweb.freebsd.org/changeset/ports/502420 Log: lang/rust-nightly: Fix check-plist same as lang/rust 1.35.0 Avoid staging the local copy of LLVM into ${STAGEDIR}${WRKDIR} during install. Added: head/lang/rust-nightly/files/patch-src_bootstrap_native.rs - copied unchanged from r502416, head/lang/rust/files/patch-src_bootstrap_native.rs Copied: head/lang/rust-nightly/files/patch-src_bootstrap_native.rs (from r502416, head/lang/rust/files/patch-src_bootstrap_native.rs) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/rust-nightly/files/patch-src_bootstrap_native.rs Fri May 24 05:58:28 2019 (r502420, copy of r502416, head/lang/rust/files/patch-src_bootstrap_native.rs) @@ -0,0 +1,46 @@ +Avoid unnecessarily restarting the LLVM build and installing it +into STAGEDIR during the install phase. + +--- src/bootstrap/native.rs.orig 2019-05-22 05:39:52 UTC ++++ src/bootstrap/native.rs +@@ -92,17 +92,9 @@ impl Step for Llvm { + .join(exe("llvm-config", &*builder.config.build)); + let done_stamp = out_dir.join("llvm-finished-building"); + +- if let Some(llvm_commit) = llvm_info.sha() { + if done_stamp.exists() { +- let done_contents = t!(fs::read(&done_stamp)); +- +- // If LLVM was already built previously and the submodule's commit didn't change +- // from the previous build, then no action is required. +- if done_contents == llvm_commit.as_bytes() { +- return build_llvm_config +- } ++ return build_llvm_config + } +- } + + let _folder = builder.fold_output(|| "llvm"); + let descriptor = if emscripten { "Emscripten " } else { "" }; +@@ -218,6 +210,10 @@ impl Step for Llvm { + } + } + ++ if target == "powerpc64-unknown-freebsd" { ++ cfg.define("CMAKE_EXE_LINKER_FLAGS", "-Wl,-rpath=/usr/local/lib/%CC% -L/usr/local/lib/%CC%"); ++ } ++ + // http://llvm.org/docs/HowToCrossCompileLLVM.html + if target != builder.config.build && !emscripten { + builder.ensure(Llvm { +@@ -283,9 +279,7 @@ impl Step for Llvm { + + cfg.build(); + +- if let Some(llvm_commit) = llvm_info.sha() { +- t!(fs::write(&done_stamp, llvm_commit)); +- } ++ t!(fs::write(&done_stamp, "done building LLVM")); + + build_llvm_config + }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201905240558.x4O5wT3I037390>