Date: Tue, 8 Oct 2019 18:16:01 +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: <20191008181601.02123964@FreeBSD.org> In-Reply-To: <201909290415.x8T4FldF031158@repo.freebsd.org> References: <201909290415.x8T4FldF031158@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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 > > Log: > Reduce code duplication by calling fetch target > > 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= > > Let's call again do-fetch directly instead of duplicating its content > > PR: 215530 > Reported by: jbeich > Differential Revision: https://reviews.freebsd.org/D21544 > > Modified: > head/Mk/bsd.port.mk > > Modified: head/Mk/bsd.port.mk > ============================================================================== > --- 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= \ > # 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=yes dp_DISABLE_SIZE=yes \ > - dp_SITE_FLAVOR=MASTER \ > - ${SH} ${SCRIPTSDIR}/do-fetch.sh ${DISTFILES:C/.*/'&'/} > -.endif > -.if defined(PATCHFILES) && !empty(PATCHFILES) > - @${SETENV} \ > - ${_DO_FETCH_ENV} ${_PATCH_SITES_ENV} \ > - dp_NO_CHECKSUM=yes dp_DISABLE_SIZE=yes \ > - dp_SITE_FLAVOR=PATCH \ > - ${SH} ${SCRIPTSDIR}/do-fetch.sh ${PATCHFILES:C/:-p[0-9]//:C/.*/'&'/} > -.endif > + @cd ${.CURDIR} && ${MAKE} fetch NO_CHECKSUM=yes \ > + DISABLE_SIZE=yes 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="${DISTFILES}" to this line?
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20191008181601.02123964>