Date: Tue, 8 Oct 2019 20:33:20 +0200 From: =?UTF-8?B?VMSzbA==?= Coosemans <tijl@FreeBSD.org> To: Baptiste Daroussin <bapt@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: <20191008203314.5edca8ac@FreeBSD.org> In-Reply-To: <20191008165321.yasyv2pds6xnim5z@ivaldir.net> References: <201909290415.x8T4FldF031158@repo.freebsd.org> <20191008181601.02123964@FreeBSD.org> <20191008165321.yasyv2pds6xnim5z@ivaldir.net>
next in thread | previous in thread | raw e-mail | index | archive | help
On Tue, 8 Oct 2019 18:53:21 +0200 Baptiste Daroussin <bapt@FreeBSD.org> wrote: > 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: =20 >>> 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 >>=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 li= ne? =20 >=20 > I am fine with that, can you check with the case in the PR is still funct= ional? > if yes, then please just commit with my approval. Committed in r514097.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20191008203314.5edca8ac>