On Sat, Jun 11, 2016 at 09:51:29PM +0100, Stuart Henderson wrote: > On 2016/06/08 22:20, Sebastien Marie wrote: > > CVSROOT: /cvs > > Module name: ports > > Changes by: [email protected] 2016/06/08 22:20:10 > > > > Modified files: > > lang/rust : Makefile distinfo > > lang/rust/patches: patch-src_librustdoc_test_rs > > patch-src_libstd_sys_unix_os_rs > > Added files: > > lang/rust/patches: patch-mk_main_mk > > > > Log message: > > lang/rust: change bootstrap method > > > > OK juanfra@ > > > > +DISTFILES += rustc-bootstrap-${MACHINE_ARCH}-${BV}.tar.gz:0 > > dpb fetching is run on all arches, including ones which are not > listed in "ONLY_FOR_ARCHS", so whatever makes it into DISTFILES > needs to be fetchable. > > Diff below is probably the easiest way out for now, unless someone > has a better idea.
ah, I missed that fetching was done on all archs. sorry. the diff is OK semarie@ > Index: Makefile > =================================================================== > RCS file: /cvs/ports/lang/rust/Makefile,v > retrieving revision 1.24 > diff -u -p -r1.24 Makefile > --- Makefile 9 Jun 2016 04:20:10 -0000 1.24 > +++ Makefile 11 Jun 2016 20:48:33 -0000 > @@ -38,7 +38,9 @@ MASTER_SITES0 = http://semarie.free.fr/ > > DIST_SUBDIR = rust > DISTFILES = ${DISTNAME}${EXTRACT_SUFX} > +.if "${MACHINE_ARCH}" == "amd64" > DISTFILES += rustc-bootstrap-${MACHINE_ARCH}-${BV}.tar.gz:0 > +.endif > > SUPDISTFILES = rustc-bootstrap-amd64-${BV}.tar.gz:0 > > > Also noticed while there.. > > RUST_HASH != echo -n ${V} | md5 | cut -c1-8 > > afaik we try to avoid "!=" in Makefiles unless it's unavoidable.. > I switched from manually setting the version to this more "automatic" way. But I could revert to manual way if it is preferable. -- Sebastien Marie
