Hi, Thanks for taking care of this. The diff looks good to me.
Do we still need the symlink that we added in the last commit? Thanks On 30 March 2017 05:38:37 BST, Sebastien Marie <[email protected]> wrote: >Hi, > >naddy@ reported to me that lang/rust build has failed. The error was >related to rustdoc hack which wasn't enough to have documentation (the >problem is related to not determinist order of build). > >I patched rustbuild (the build tool for rustc) to ensure that >documentation requires rustdoc as dependency. > >The following diff changes the dependency of src/doc which is on stage0 >(the bootstrap) to stage2 (the final executable). > >I tested it on amd64. By requesting building only documentation (edd@: >so it is possible with "src/doc" as argument of rustbuild), I was able >to reliably trigger the problem. After the diff, building the >documentation requires to first build rustc and rustdoc. > >Bumping REVISION shouldn't be strictly needed: the diff changes only >the >build order of targets: or the order was right and package was built, >or >the order was wrong and package wasn't built. There is no binary >changes >expected. But it doesn't hurt to do it. > >The default build order is not determinist. It explains why I missed it >on testing. Sorry about that. > >Thanks. >-- >Sebastien Marie > > >Index: Makefile >=================================================================== >RCS file: /cvs/ports/lang/rust/Makefile,v >retrieving revision 1.40 >diff -u -p -r1.40 Makefile >--- Makefile 27 Mar 2017 23:43:07 -0000 1.40 >+++ Makefile 30 Mar 2017 04:25:59 -0000 >@@ -8,6 +8,7 @@ COMMENT-doc = html documentation for ru > > V = 1.16.0 > DISTNAME = rustc-${V}-src >+REVISION = 0 > > # rustc bootstrap version > RBV-amd64 = 1.16.0-20160315 >Index: patches/patch-src_bootstrap_step_rs >=================================================================== >RCS file: patches/patch-src_bootstrap_step_rs >diff -N patches/patch-src_bootstrap_step_rs >--- /dev/null 1 Jan 1970 00:00:00 -0000 >+++ patches/patch-src_bootstrap_step_rs 30 Mar 2017 04:25:59 -0000 >@@ -0,0 +1,13 @@ >+$OpenBSD$ >+Require having building rustdoc before trying to build docs. >+--- src/bootstrap/step.rs.orig Wed Mar 29 18:57:20 2017 >++++ src/bootstrap/step.rs Wed Mar 29 18:57:35 2017 >+@@ -542,7 +542,7 @@ pub fn build_rules<'a>(build: &'a Build) -> Rules >{ >+ s.name("rustc") >+ .host(&build.config.build) >+ .target(&build.config.build) >+- .stage(0) >++ .stage(2) >+ }) >+ .default(build.config.docs) >+ .run(move |s| doc::standalone(build, s.target)); -- Sent from my Android device with K-9 Mail. Please excuse my brevity.
