Date: Wed, 28 Jun 2017 12:25:53 -0700 From: "Ngie Cooper (yaneurabeya)" <yaneurabeya@gmail.com> To: Cy Schubert <cy@FreeBSD.org> Cc: src-committers <src-committers@freebsd.org>, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r320454 - head/share/zoneinfo Message-ID: <3305BCF7-0978-4152-B3AD-309FD891B59D@gmail.com> In-Reply-To: <201706281905.v5SJ55Zb062532@repo.freebsd.org> References: <201706281905.v5SJ55Zb062532@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] > On Jun 28, 2017, at 12:05, Cy Schubert <cy@FreeBSD.org> wrote: > > Author: cy > Date: Wed Jun 28 19:05:04 2017 > New Revision: 320454 > URL: https://svnweb.freebsd.org/changeset/base/320454 > > Log: > Allow parallel installworld (-j N) and poudriere installworld > (poudriere jail -c and poudriere jail -u) to proceed. > > Reviewed by: trasz@ > Tested by: trasz@, cy@ > MFC after: 1 month > X-MFC-with: r320362 > > Modified: > head/share/zoneinfo/Makefile > > Modified: head/share/zoneinfo/Makefile > ============================================================================== > --- head/share/zoneinfo/Makefile Wed Jun 28 17:32:09 2017 (r320453) > +++ head/share/zoneinfo/Makefile Wed Jun 28 19:05:04 2017 (r320454) > @@ -94,7 +94,7 @@ install-zoneinfo: > .for f in ${TZS} > ${INSTALL} ${TAG_ARGS} \ > -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \ > - ${TZBUILDDIR:C,^${.OBJDIR}/,,}/${f} ${DESTDIR}/usr/share/zoneinfo/${f} > + ${TZBUILDDIR}/${f} ${DESTDIR}/usr/share/zoneinfo/${f} > .endfor > ${INSTALL} ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \ > ${CONTRIBDIR}/zone.tab ${DESTDIR}/usr/share/zoneinfo/ Thank you for getting this in! In general, I would argue that for/.for loops in Make targets are bad like this I think that individual targets could in fact be created, and driven as a dependency of a top-level target, to avoid this issue and keep bdrewery’s intended change in r320362, e.g. something like, install-zones: .PHONY .for f in ${TZS} install-zones: ${DESTDIR}/usr/share/zoneinfo/${f} ${DESTDIR}/usr/share/zoneinfo/${f}: ${f} ${INSTALL} ... .endfor I’m not incredibly sure based on this commit alone why this Makefile isn’t using FILES though… I’ll look at it closer when I have a spare minute. Thanks, -Ngie [-- Attachment #2 --] -----BEGIN PGP SIGNATURE----- Comment: GPGTools - https://gpgtools.org iQIcBAEBCgAGBQJZVALBAAoJEPWDqSZpMIYVgcYP/3R5QvAZnRidzyPdfHFGOekX uL2esI0enXJUnlgQsQLSWi5aG6nDONAi3EanKI0OgJ2iKpRdKX5OFs+2rahcm6uD MaQyvbn/5+lL25g9O1V5/P5Eoa32kMkvYxHkxaz3YPJzkLto1I2R2J9Hj3g6jVU2 OrmPz71vU0X1G2QthXOzf63w+wbUF8YlmSrzZ2+ZgMeCKzfUdLuWrGejgY9ETHEz BbhLXQ2uvYqjJ4Ij00ojvMZCx5xaeFWpU5AR9dluwyaWp90U4Ey+5sPKdw2K/x5D +KNib3mgs79/K3vHSfr8ahyFUijxZN3uTmeGaBcOhQRr8ngI51ZmzWq83A0cGy/P yWg8mNeJ8CNhNoHE2bGyEYJxyBbAkykOqH5IidtgUMg+uO7JSNi15gZ5C77xmRFx GM191qQEQDpo7e6XcwM8/vUsqcTv1Az8MHnViuiDSC9D2ZZVgj/ZWG7jNt4HZquw 7PlwSGu1DXdlyhCPCa9dplOv3yuVbLJE9FOajfwstket7Jq8AwKLghaZlL+V7M8T X6UJEIUUVitmhzKd9cZqNopbZSsWX2dCx5mkxEY96+q/6gCnido0Tvk6TBfGyQGt nl+6+X0BHZk33bsVQL1jYWEQhJBYa/txlO8ZoORiu6cpNou1feaXhh3y7S++Q2Dq +oqopbUVDfjeK5B4/KTP =/DIH -----END PGP SIGNATURE-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?3305BCF7-0978-4152-B3AD-309FD891B59D>