Date: Tue, 8 Oct 2019 18:53:21 +0200 From: Baptiste Daroussin <bapt@FreeBSD.org> To: =?utf-8?Q?T=C4=B3l?= Coosemans <tijl@FreeBSD.org> Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org, jbeich@FreeBSD.org Subject: Re: svn commit: r513191 - head/Mk Message-ID: <20191008165321.yasyv2pds6xnim5z@ivaldir.net> In-Reply-To: <20191008181601.02123964@FreeBSD.org> References: <201909290415.x8T4FldF031158@repo.freebsd.org> <20191008181601.02123964@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--sn7pwxnf4ukg7i7v Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Oct 08, 2019 at 06:16:01PM +0200, T=C4=B3l Coosemans wrote: > On Sun, 29 Sep 2019 04:15:47 +0000 (UTC) Baptiste Daroussin > <bapt@FreeBSD.org> wrote: > > Author: bapt > > Date: Sun Sep 29 04:15:47 2019 > > New Revision: 513191 > > URL: https://svnweb.freebsd.org/changeset/ports/513191 > >=20 > > Log: > > Reduce code duplication by calling fetch target > > =20 > > when converting the do-fetch target to proper scripting > > we lost the ability to overwrite do-fetch when running make makesum. > > as reported here: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D > > =20 > > Let's call again do-fetch directly instead of duplicating its content > > =20 > > PR: 215530 > > Reported by: jbeich > > Differential Revision: https://reviews.freebsd.org/D21544 > >=20 > > Modified: > > head/Mk/bsd.port.mk > >=20 > > Modified: head/Mk/bsd.port.mk > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D > > --- head/Mk/bsd.port.mk Sun Sep 29 03:54:21 2019 (r513190) > > +++ head/Mk/bsd.port.mk Sun Sep 29 04:15:47 2019 (r513191) > > @@ -3873,20 +3873,8 @@ _CHECKSUM_INIT_ENV=3D \ > > # As we're fetching new distfiles, that are not in the distinfo file, = disable > > # checksum and sizes checks. > > makesum: check-sanity > > -.if !empty(DISTFILES) > > - @${SETENV} \ > > - ${_DO_FETCH_ENV} ${_MASTER_SITES_ENV} \ > > - dp_NO_CHECKSUM=3Dyes dp_DISABLE_SIZE=3Dyes \ > > - dp_SITE_FLAVOR=3DMASTER \ > > - ${SH} ${SCRIPTSDIR}/do-fetch.sh ${DISTFILES:C/.*/'&'/} > > -.endif > > -.if defined(PATCHFILES) && !empty(PATCHFILES) > > - @${SETENV} \ > > - ${_DO_FETCH_ENV} ${_PATCH_SITES_ENV} \ > > - dp_NO_CHECKSUM=3Dyes dp_DISABLE_SIZE=3Dyes \ > > - dp_SITE_FLAVOR=3DPATCH \ > > - ${SH} ${SCRIPTSDIR}/do-fetch.sh ${PATCHFILES:C/:-p[0-9]//:C/.*/'&'/} > > -.endif > > + @cd ${.CURDIR} && ${MAKE} fetch NO_CHECKSUM=3Dyes \ > > + DISABLE_SIZE=3Dyes >=20 > This breaks make makesum in linux ports. Uses/linux.mk includes all > architectures in DISTFILES in the case of make makesum. The fetch > submake here doesn't know it's called from makesum so it gets the wrong > DISTFILES. Maybe you can just add DISTFILES=3D"${DISTFILES}" to this lin= e? I am fine with that, can you check with the case in the PR is still functio= nal? if yes, then please just commit with my approval. Best regards, Bapt --sn7pwxnf4ukg7i7v Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEgOTj3suS2urGXVU3Y4mL3PG3PloFAl2cvv4ACgkQY4mL3PG3 PloiDhAAqxuhDiAar8XP+VvoDWqfux3o2i6olhz84McQqnJ/ptawj83NferLeTOm ZFm/FxCjbt4CGxBgwezYEJiS2Gs/4K5sA8MqvY59DrxdO3EPZkWW/U/NOkf3AVb0 j8nm0LMW4QMCwXo0F3kcBl/PUI+9nszPWrv+L2AdoU8e+cntc45rguoacVHMv07L J598g/OYgyAQB7xZOdLHJ7JvrbW+DDRWVRlznwLw79ms1vRUbIcxhjIFvk/Y1+uk hZXy0fY4oAMznRhKWwgWSFIORxJIKCDKtd/38PkfK1EH06t1sEwCldvSE4pQ85Cz Wh4yV9eGHd4G5j2omcF9QzChC1Q7o8MVX/eT0fbzEQqyMjT7e7M5dXlilYwjaw/O MrcPIn69dAhn0GvmNkG4nsLXkC29VBRtLgO+UK0zIjo5exm/2Hxehr0G2PsQnA8K dmpCyRPJqzmMBcJHBLMPb1SJRQJTwC8MfjSYSNYazFsvmB1Lq13qfiRDXqWC98XZ fx45WgFVuZERXk6MYbbbZqfi0DvIWCzlvB5VP36OVYN3/qKC0TLqsoy0W/dM17Sc vHtO4Lrj8Yh0HLEJVkzFOe1OXIYeafra1XeNAGwJJ9pkA+9vcmgv5nGtff43qj7h 59joqQKr4LihaE3/jshsMMvXAgDWulEZfwKylnENqH5zexHQq8I= =qW8P -----END PGP SIGNATURE----- --sn7pwxnf4ukg7i7v--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20191008165321.yasyv2pds6xnim5z>