• [gentoo-dev] [PATCH 5/6] distutils-r1.eclass: Add DISTUTILS_DEPS output

    From =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?@21:1/5 to All on Tue Feb 1 00:10:01 2022
    The PEP 517 build-time deps have gotten more complex, and largely depend
    on the internal eclass logic used to build and install wheels.
    Introduce a DISTUTILS_DEPS output variable that contains the correct
    BDEPEND string for use in DISTUTILS_OPTIONAL=1 ebuilds.

    Signed-off-by: Michał Górny <mgorny@gentoo.org>
    ---
    eclass/distutils-r1.eclass | 34 +++++++++++++++++++++++++++++++++-
    1 file changed, 33 insertions(+), 1 deletion(-)

    diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
    index 4a9fdb4018b4..a0ad598eb58f 100644
    --- a/eclass/distutils-r1.eclass
    +++ b/eclass/distutils-r1.eclass
    @@ -128,6 +128,24 @@ esac
    # It is available only in non-PEP517 mode. It needs to be set before
    # the inherit line.

    +# @ECLASS-VARIABLE: DISTUTILS_DEPS
    +# @OUTPUT_VARIABLE
    +# @DESCRIPTION:
    +# This is an eclass-generated build-time dependency string for the build
    +# system packages. This string is automatically appended to BDEPEND
    +# unless DISTUTILS_OPTIONAL is used. This variable is available only
    +# in PEP 517 mode.
    +#
    +# Example use:
    +# @CODE
    +# DISTUTILS_OPTIONAL=1
    +# # ...
    +# RDEPEND="${PYTHON_DEPS}"
    +# BDEPEND="
    +# ${PYTHON_DEPS}
    +# ${DISTUTILS_DEPS}"
    +# @CODE
    +
    if [[ ! ${_DISTUTILS_R1} ]]; then

    [[ ${EAPI} == 6 ]] && inherit eutils xdg-utils
    @@ -156,7 +174,7 @@ _d
  • From Sam James@21:1/5 to All on Tue Feb 1 00:10:01 2022
    --Apple-Mail=_05D836CE-2A7E-4157-BC6B-86A94A5BF45D
    Content-Transfer-Encoding: quoted-printable
    Content-Type: text/plain;
    charset=utf-8



    On 31 Jan 2022, at 22:59, Michał Górny <mgorny@gentoo.org> wrote:

    The PEP 517 build-time deps have gotten more complex, and largely depend
    on the internal eclass logic used to build and install wheels.
    Introduce a DISTUTILS_DEPS output variable that contains the correct
    BDEPEND string for use in DISTUTILS_OPTIONAL=1 ebuilds.

    Signed-off-by: Michał Górny <mgorny@gentoo.org>
    ---

    All LGTM (checked when on GH), but add bug ref to this commit: https://bugs.gentoo.org/832337 <https://bugs.gentoo.org/832337>.

    Best,
    sam

    --Apple-Mail=_05D836CE-2A7E-4157-BC6B-86A94A5BF45D
    Content-Transfer-Encoding: quoted-printable
    Content-Type: text/html;
    charset=utf-8

    <html><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; line-break: after-white-space;" class=""><br class=""><div><br class=""><blockquote type="cite" class=""><
    div class="">On 31 Jan 2022, at 22:59, Michał Górny &lt;<a href="mailto:mgorny@gentoo.org" class="">mgorny@gentoo.org</a>&gt; wrote:</div><br class="Apple-interchange-newline"><div class=""><div class="">The PEP 517 build-time deps have gotten more
    complex, and largely depend<br class="">on the internal eclass logic used to build and install wheels.<br class="">Introduce a DISTUTILS_DEPS output variable that contains the correct<br class="">BDEPEND string for use in DISTUTILS_OPTIONAL=1 ebuilds.<br
    class=""><br class="">Signed-off-by: Michał Górny &lt;<a href="mailto:mgorny@gentoo.org" class="">mgorny@gentoo.org</a>&gt;<br class="">---</div></div></blockquote><br class=""></div><div>All LGTM (checked when on GH), but add bug ref to this commit:</
    <div><a href="https://bugs.gentoo.org/832337" class="">https://bugs.gentoo.org/832337</a>.</div><div><br class=""></div><div>Best,</div><div>sam</div></body></html>
    --Apple-Mail=_05D836CE-2A7E-4157-BC6B-86A94A5BF45D--

    -----BEGIN PGP SIGNATURE-----

    iQGTBAEBCgB9FiEEYOpPv/uDUzOcqtTy9JIoEO6gSDsFAmH4a45fFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDYw RUE0RkJGRkI4MzUzMzM5Q0FBRDRGMkY0OTIyODEwRUVBMDQ4M0IACgkQ9JIoEO6g SDvBgwgAnFgO48Ie8KsF4V3iJPu51WzQIU3L3PihJ0OMTVXQ6E36nh29zfpqXnBr utW911lE57CzrAz2iTVVNULKY0pk2+V/agiu/xH7KHcaw2eeYF5kRi1wgOMbosKv WYVppgYk5yJLXyD+Ja26kNdYr0pSB42/4SCWgyGhhBAHHZCLyE1iDePdw74UqGcO z17hpabQQrys3nNWKdjvCi/A4hmMiuEuHm5pG4iMwon00NoiW+J4GqZUf5Of0TWu W0iHmWkj9TEv2a+MNYdxwA2FTaQDXmiO2bUOGQwao5tkoGWkYxYf9CFVHNcmaGh4 sHKHc/DgnMLnWWAg7OxnA0MyV8KTsA==
    =eDlm
    -----END PGP SIGNATURE-----

    --- SoupGate-Win32 v1.05
    * Origin: fsxNet Usenet Gateway (21:1/5)
  • From =?UTF-8?Q?Micha=C5=82_G=C3=B3rny?=@21:1/5 to Sam James on Tue Feb 1 09:40:02 2022
    On Mon, 2022-01-31 at 23:06 +0000, Sam James wrote:

    On 31 Jan 2022, at 22:59, Michał Górny <mgorny@gentoo.org> wrote:

    The PEP 517 build-time deps have gotten more complex, and largely depend
    on the internal eclass logic used to build and install wheels.
    Introduce a DISTUTILS_DEPS output variable that contains the correct BDEPEND string for use in DISTUTILS_OPTIONAL=1 ebuilds.

    Signed-off-by: Michał Górny <mgorny@gentoo.org>
    ---

    All LGTM (checked when on GH), but add bug ref to this commit: https://bugs.gentoo.org/832337 <https://bugs.gentoo.org/832337>.


    Done.

    --
    Best regards,
    Michał Górny

    --- SoupGate-Win32 v1.05
    * Origin: fsxNet Usenet Gateway (21:1/5)