From nobody Thu Mar 09 07:56:39 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PXM2h6xR3z3wL70; Thu, 9 Mar 2023 07:56:44 +0000 (UTC) (envelope-from mat@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PXM2h62yvz4Fbh; Thu, 9 Mar 2023 07:56:44 +0000 (UTC) (envelope-from mat@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678348604; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=l56kWuvF2nKK/NO7C03VyskyNWFpdnP4i4xPezWvubw=; b=GX8JSpvG6Z2uUhH6AP54xNTJSWe4B5ky7l+O5urPgrfxLIjoFeCUo5ICsZlomUwu3o05OR sqNcStLC8wejn5uTTc2bjdbI4MWlb+k1tPoAKaEu6mT56BzSYyX6iUnDcxgmfjZsoimxMz nc3CQ6b9QaCCI+F7Lm4XK2uqrlUdZO4px5An01Y1OPJ6n/3M2Qzd/l8xuzqOcjLu0UTRVd HF2Swbr/xLve242aXoy+yHURkLFvkmk2hxyeORt6gqbT0S39kfKIFkK4MZEvb7xrhgFbTe 7YnQUeWogPL/32PdPCwHRltfaJ2APF3YfqPJAVkrf9FFlxH/mG94P70gzJlxdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678348604; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=l56kWuvF2nKK/NO7C03VyskyNWFpdnP4i4xPezWvubw=; b=WzW+L408H1RZjxeoySi6Uk/c1M15BdYiEzvQunc6Ix+btE7aMMN2EklWspGrtSeHix9i59 sRgnsTrJi5hzAjLilNTPJ3bdIH4qRdspz86PY/FHcTmnjSV1Dba9C0vmQTkfs5uupj8RO/ KHvb4+yH6SU+D2WI/lq2ljcUo2IHCS9bZLYQlnNGQq+pK2Q8Jga27CrbxQqOv3EjynQ7ap 2IC4zHS9Ii90Y1jDcDNOx7DdspEokIK2LTzlh+3aZv79Kr+PdgPNF0eC5nt1x6KBbN0Ugw InUc3O0Rrb15yzTxBZDNWmPXk9jdMZF3l8puL5d+oIAB3LiY9rLJlsp+CacedA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678348604; a=rsa-sha256; cv=none; b=bAq2W0AIG3vlJ9mt+181t15+o9KoJC2rOAMJM7GcSVabJJAfX0kviO1TXoGwTLX4AgTAQt bJyMC3cj3XZP03tHgx1HlHihHv61U38m+qIfKRmuVU3sYAVLcCWFr/1CCenkBGSOpTVxQR hCTYWne23ErukiHiO8Nda+wS7puTbd26S1LTh3WUxFBKKmeZmNUr66wD4pOTVI2bJg+RUu fCK6b5T9bNYBoSu4CuNv62UmKuVtd0cV2vVMeBmYM+L2+XXFPUQRZgdRnsZQwlFqnU2/tL buAUKRk2BCMzMz/mBEVwu4c+hSYdjop10ud9dOnlGgCSG4jv2qm8xTT0LNWRQQ== Received: from mail.j.mat.cc (owncloud.cube.mat.cc [79.143.240.228]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mail.mat.cc", Issuer "R3" (verified OK)) (Authenticated sender: mat/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4PXM2h4Hr3zPcN; Thu, 9 Mar 2023 07:56:44 +0000 (UTC) (envelope-from mat@freebsd.org) Received: from aching.in.mat.cc (unknown [IPv6:2a01:678:ab:50:4f14:fa1b:4cd6:40a1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: mat@mat.cc) by mail.j.mat.cc (Postfix) with ESMTPSA id 723FE942D80; Thu, 9 Mar 2023 07:56:41 +0000 (UTC) Date: Thu, 9 Mar 2023 08:56:39 +0100 From: Mathieu Arnold To: Charlie Li Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Subject: Re: git: 16a6fecb4ff8 - main - python.mk: use script to process RECORD for the first pass Message-ID: <20230309075639.uhkun74v7gdwmucb@aching.in.mat.cc> References: <202303090344.3293i8Q4064024@gitrepo.freebsd.org> List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="mukgrrl4vrbj64yw" Content-Disposition: inline In-Reply-To: <202303090344.3293i8Q4064024@gitrepo.freebsd.org> X-ThisMailContainsUnwantedMimeParts: N --mukgrrl4vrbj64yw Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Mar 09, 2023 at 03:44:08AM +0000, Charlie Li wrote: > The branch main has been updated by vishwin: >=20 > URL: https://cgit.FreeBSD.org/ports/commit/?id=3D16a6fecb4ff8b051ba1b2382= 67b7cd15b19cda75 >=20 > commit 16a6fecb4ff8b051ba1b238267b7cd15b19cda75 > Author: Charlie Li > AuthorDate: 2023-03-09 03:33:57 +0000 > Commit: Charlie Li > CommitDate: 2023-03-09 03:33:57 +0000 >=20 > python.mk: use script to process RECORD for the first pass > =20 > RECORD is a CSV file [0] containing more data than our plist format > accepts. The original processing method used sed(1) exclusively, > but paths containing quotes, spaces and commas throw it off. Process > the CSV properly instead for the first pass. > =20 > References: https://packaging.python.org/en/latest/specifications/rec= ording-installed-packages/#the-record-file [0] > --- > Mk/Uses/python.mk | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) >=20 > diff --git a/Mk/Uses/python.mk b/Mk/Uses/python.mk > index d0754dc02097..6e25d0427cb2 100644 > --- a/Mk/Uses/python.mk > +++ b/Mk/Uses/python.mk > @@ -870,7 +870,9 @@ do-build: > do-install: > @${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} > @cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${PEP517_INSTALL_CMD} > - @${SED} -e 's|^|${PYTHONPREFIX_SITELIBDIR}/|' \ > + @${PYTHON_CMD} -B ${PORTSDIR}/Tools/scripts/strip_RECORD.py \ > + ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${PORTNAME:C/[-_]+/_/g}-${PORTVE= RSION}.dist-info/RECORD >> ${_PYTHONPKGLIST} Any script that is used by the framework must be put in Mk/scripts. The scripts in Tools are user contributed and not supported. > + @${REINPLACE_CMD} -e 's|^|${PYTHONPREFIX_SITELIBDIR}/|' \ > -e 's|^${PYTHONPREFIX_SITELIBDIR}/../../../etc/|etc/|' \ > -e 's|^${PYTHONPREFIX_SITELIBDIR}/../../../bin/|bin/|' \ > -e 's|^${PYTHONPREFIX_SITELIBDIR}/../../../include/|include/|' \ > @@ -880,8 +882,7 @@ do-install: > -e 's|^${PYTHONPREFIX_SITELIBDIR}/../../../man/|man/|' \ > -e 's|^${PYTHONPREFIX_SITELIBDIR}/../../../sbin/|sbin/|' \ > -e 's|^${PYTHONPREFIX_SITELIBDIR}/../../../share/|share/|' \ > - -e 's|\,.*$$||' \ > - ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${PORTNAME:C/[-_]+/_/g}-${PORTVE= RSION}.dist-info/RECORD >> ${_PYTHONPKGLIST} > + ${_PYTHONPKGLIST} > . endif > . endif # defined(_PYTHON_FEATURE_PEP517) > =20 >=20 --=20 Mathieu Arnold --mukgrrl4vrbj64yw Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQITBAABCgB9FiEE9XJBpJetWizkEBUef2IOCp6dQb4FAmQJkTdfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEY1 NzI0MUE0OTdBRDVBMkNFNDEwMTUxRTdGNjIwRTBBOUU5RDQxQkUACgkQf2IOCp6d Qb78TAv+M0OzLdlDSlF3khv1DLxXWJQc60ZDR3Tp0ARSfT3WrwuQPDjTdz5lsfjS 6EYdAku3GmRulo3XYFLkhvrOSEu3Zwl67shI1UAx1907Ms8npjelw7o8o6XQWW7O /f1QbUK6T0xUZDbndogYBtayiu/iiAJCeKBpEjG6Lsc72GX5YxGy96b8t5ahjZxc DbBubMIHcxSRgouJ/sS4P8H4maSyFRVJe3IE/fCdi56LDQsBAd+whoAn6YpPDsh2 Js6ybLY1ipAeAJHHddwUMSzxtga+F6ncLTC6OXEVwVUPKkBr8AgNBmnYP3WLGXKK fz9sLfBye1lavjdgMfAxQWJ8mjmL2yXe07Jg1LT2M47/Kt2qbxiNhFsODOA73Uqr /3ShhSYLAzb0yx0U5DOS0IYB99r5d4iNp/M1cNfe7EJakW/uzXzuemWrhefutGjN QQBj8UG6VA+NK2ntsqree3L1CyDVxF4dbglSa13yA+nJyF5ngJ5ffsep0EFHsv68 VBtrhkHp =FcTK -----END PGP SIGNATURE----- --mukgrrl4vrbj64yw--