From owner-svn-ports-all@freebsd.org Tue Oct 8 18:33:24 2019 Return-Path: Delivered-To: svn-ports-all@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 AA0BE133250; Tue, 8 Oct 2019 18:33:24 +0000 (UTC) (envelope-from tijl@freebsd.org) Received: from mailrelay104.isp.belgacom.be (mailrelay104.isp.belgacom.be [195.238.20.131]) (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 46nmFH6Ksjz4Mkw; Tue, 8 Oct 2019 18:33:23 +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?A2DBCgAu1Zxd/ygG91FmHAEBAQEBBwE?= =?us-ascii?q?BEQEEBAEBgXuCHkcSFFIBIBIWFIQjiQKFYAGCDjUBSIlnkEEJAQECAQEBAQE?= =?us-ascii?q?rDAEBhEACgkImOBMCDAEBBQEBAQEBBQRthGtCDIVMAQUjMyMQCw4GBAICBSE?= =?us-ascii?q?CAg9IBhODI4IOC65qgTKEOAELAYRvgRCBDCiMJoF/gRGCXTU+gmEEgV+DDoJ?= =?us-ascii?q?YBK1DgiyHCI4FJ4I6coZcjziEN5IYkyUigVhNMAiDJwlHEBSJYXWBPYQEPwM?= =?us-ascii?q?wAZETAQE?= X-IPAS-Result: =?us-ascii?q?A2DBCgAu1Zxd/ygG91FmHAEBAQEBBwEBEQEEBAEBgXuCH?= =?us-ascii?q?kcSFFIBIBIWFIQjiQKFYAGCDjUBSIlnkEEJAQECAQEBAQErDAEBhEACgkImO?= =?us-ascii?q?BMCDAEBBQEBAQEBBQRthGtCDIVMAQUjMyMQCw4GBAICBSECAg9IBhODI4IOC?= =?us-ascii?q?65qgTKEOAELAYRvgRCBDCiMJoF/gRGCXTU+gmEEgV+DDoJYBK1DgiyHCI4FJ?= =?us-ascii?q?4I6coZcjziEN5IYkyUigVhNMAiDJwlHEBSJYXWBPYQEPwMwAZETAQE?= 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 20:33:21 +0200 Received: from localhost (localhost [127.0.0.1]) by kalimero.tijl.coosemans.org (8.15.2/8.15.2) with ESMTP id x98IXKLI047683; Tue, 8 Oct 2019 20:33:21 +0200 (CEST) (envelope-from tijl@FreeBSD.org) Date: Tue, 8 Oct 2019 20:33:20 +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: <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> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 46nmFH6Ksjz4Mkw X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-1.92 / 15.00]; local_wl_from(0.00)[freebsd.org]; NEURAL_HAM_MEDIUM(-0.92)[-0.918,0]; NEURAL_HAM_LONG(-1.00)[-0.998,0]; ASN(0.00)[asn:5432, ipnet:195.238.0.0/19, country:BE] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Oct 2019 18:33:24 -0000 On Tue, 8 Oct 2019 18:53:21 +0200 Baptiste Daroussin 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 >> 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.