From nobody Thu Mar 09 03:44:08 2023 X-Original-To: dev-commits-ports-main@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 4PXFRD6QWlz3xHWn; Thu, 9 Mar 2023 03:44:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PXFRD5pkVz3q4X; Thu, 9 Mar 2023 03:44:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678333448; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e+FwpI2/Y3trZoZY41XE12VFXLC7GiLuGB9iv1RWXZs=; b=WB94ieNsYNJCmSzTsxOHCj7o8BqkelH2+lcV2pOaLDdm1pcmt2seWPvoBhEDQKkRv/Y/es N1kMOPWfGbL9RTOLZRf4tiZi1RivNb4Fn0E+zyye2gVLYGv7XvvGK4WTKTpRvPULH3bxPW J8hhVTvMenL174cLtEaHa/GSTfkhgioAPNWZZDyavspDPi2silcEa5qzEqSNWF2+uD0GuA MB2SQxO4liMSJWabgGvzYhusuP3KsGCItzJSj5UWlC83+I5e08XrKXYmOaSf6LcP4SE7dA 8nqfTx7REuEgctAO32QPS/lBGFJvPX+uA45gWZXS12omP1crbfq/CtgM/oyZDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678333448; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e+FwpI2/Y3trZoZY41XE12VFXLC7GiLuGB9iv1RWXZs=; b=Mct4u/mhp0ameB/cjppUsCUoibTcc7s7wRz/9j0IIFoY4PM7gn/IBperc5eEaOjgpZbUNn pYjrIH3cDGbJMqdrkhUV/bfXY7vPTruucQ01gH8xHir0Ei36px7ycueGRaLSDH0h5xVerA ORgREn4T1GIxfuELD9KvLDo7SPIv0ldZMCV+DFUwKrhgWBYJXq2AwehrcXqyS+yq9LIjUK 6yx4FNyWN2iewKGZefa2LSy69FfB//lO5a63Ez8311KruwQ4bQpnccGwqxuiRk/+Sj26yy s9WGQzIjFecl4VSoGWyw5PO8kHFdqqKdvl3p3ZMHP85Gs5w2pQpDI+DJ7PhsXQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678333448; a=rsa-sha256; cv=none; b=HdfSrWrgGU5kdx9RaGbsyabdUhG2GJKBtavaZKo14R7L2OIMb0oStluQrUcRdkBiwjVCJz c5NDDu9O7lTbOZ5z8HylCuAKGk37Pr6P4buRQ7W3+8PZq+7r5xaLY6hvM64BLPPPxE9sgu U9v61gs55e3vqmTcPBJBv2ZxvwLNQDJu8IaQCpOicnro1qmtJqfptDcSuWx4MU8eAyvAPj v+XAUeL6SEpBsbGhWoo3RVjfFVxbA8tS022PNSCwyTecF1a6gSvyrHOjKxtqRkkThfDrcp L4/9oJ8SvOJ97h0zzOfG2ED0HzJFu1pEmvvgkAzKYZ9AqA1aoWwHLeB76dsBaA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PXFRD4s2gzs9v; Thu, 9 Mar 2023 03:44:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 3293i8mv064025; Thu, 9 Mar 2023 03:44:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3293i8Q4064024; Thu, 9 Mar 2023 03:44:08 GMT (envelope-from git) Date: Thu, 9 Mar 2023 03:44:08 GMT Message-Id: <202303090344.3293i8Q4064024@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Charlie Li Subject: git: 16a6fecb4ff8 - main - python.mk: use script to process RECORD for the first pass List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vishwin X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 16a6fecb4ff8b051ba1b238267b7cd15b19cda75 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by vishwin: URL: https://cgit.FreeBSD.org/ports/commit/?id=16a6fecb4ff8b051ba1b238267b7cd15b19cda75 commit 16a6fecb4ff8b051ba1b238267b7cd15b19cda75 Author: Charlie Li AuthorDate: 2023-03-09 03:33:57 +0000 Commit: Charlie Li CommitDate: 2023-03-09 03:33:57 +0000 python.mk: use script to process RECORD for the first pass 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. References: https://packaging.python.org/en/latest/specifications/recording-installed-packages/#the-record-file [0] --- Mk/Uses/python.mk | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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}-${PORTVERSION}.dist-info/RECORD >> ${_PYTHONPKGLIST} + @${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}-${PORTVERSION}.dist-info/RECORD >> ${_PYTHONPKGLIST} + ${_PYTHONPKGLIST} . endif . endif # defined(_PYTHON_FEATURE_PEP517)