From owner-svn-ports-head@freebsd.org Tue Oct 8 16:16:06 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8AD7D12F37B; Tue, 8 Oct 2019 16:16:06 +0000 (UTC) (envelope-from tijl@freebsd.org) Received: from mailrelay113.isp.belgacom.be (mailrelay113.isp.belgacom.be [195.238.20.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "relay.skynet.be", Issuer "GlobalSign RSA OV SSL CA 2018" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46njBs3sNhz4BgG; Tue, 8 Oct 2019 16:16:05 +0000 (UTC) (envelope-from tijl@freebsd.org) X-Belgacom-Dynamic: yes X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: =?us-ascii?q?A2DbAACKtZxd/ygG91FlGwEBAQEBAQE?= =?us-ascii?q?FAQEBEQEBAwMBAQGBagMBAQELAYIdRxIUUgEgEhYUjSWFXwGCDjUBSIlnkEE?= =?us-ascii?q?JAQECAQEBAQErDAEBhEACgkImNwYOAgwBAQUBAQEBAQUEbYRrQgyFTAEFOhw?= =?us-ascii?q?jEAsOBgQJJQ9IBhODI4IOC69zhDgBCwGEaIEQgTQBjCWBf4ERgl01PoJhBIF?= =?us-ascii?q?fhWYElieXHIIshwiOBSeDLJYUhDeSGJMkI4FYTTAIgycJRxAUiWF1gT2EBD8?= =?us-ascii?q?DMAGREwEB?= X-IPAS-Result: =?us-ascii?q?A2DbAACKtZxd/ygG91FlGwEBAQEBAQEFAQEBEQEBAwMBA?= =?us-ascii?q?QGBagMBAQELAYIdRxIUUgEgEhYUjSWFXwGCDjUBSIlnkEEJAQECAQEBAQErD?= =?us-ascii?q?AEBhEACgkImNwYOAgwBAQUBAQEBAQUEbYRrQgyFTAEFOhwjEAsOBgQJJQ9IB?= =?us-ascii?q?hODI4IOC69zhDgBCwGEaIEQgTQBjCWBf4ERgl01PoJhBIFfhWYElieXHIIsh?= =?us-ascii?q?wiOBSeDLJYUhDeSGJMkI4FYTTAIgycJRxAUiWF1gT2EBD8DMAGREwEB?= Received: from 40.6-247-81.adsl-dyn.isp.belgacom.be (HELO kalimero.tijl.coosemans.org) ([81.247.6.40]) by relay.skynet.be with ESMTP; 08 Oct 2019 18:16:03 +0200 Received: from localhost (localhost [127.0.0.1]) by kalimero.tijl.coosemans.org (8.15.2/8.15.2) with ESMTP id x98GG2lO046692; Tue, 8 Oct 2019 18:16:02 +0200 (CEST) (envelope-from tijl@FreeBSD.org) Date: Tue, 8 Oct 2019 18:16:01 +0200 From: =?UTF-8?B?VMSzbA==?= Coosemans To: Baptiste Daroussin 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> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 46njBs3sNhz4BgG X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-1.83 / 15.00]; local_wl_from(0.00)[freebsd.org]; NEURAL_HAM_MEDIUM(-0.83)[-0.834,0]; ASN(0.00)[asn:5432, ipnet:195.238.0.0/19, country:BE]; NEURAL_HAM_LONG(-0.99)[-0.993,0] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Oct 2019 16:16:06 -0000 On Sun, 29 Sep 2019 04:15:47 +0000 (UTC) Baptiste Daroussin 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?