[PATCH] glib-2.0: Remove python3 modules when building for mingw

[PATCH] glib-2.0: Remove python3 modules when building for mingw

[Alistair Francis]

Commit "glib-2.0: Add python3 modules required by gdbus-codegen"
(26af3b4b33a34d7e53059b07236f9d5aae5e004a) broke the MinGW build of
QEMU. To fix the build remove the python3 RDEPENDS for gdbus-codegen
when targeting mingw.

Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>
---
 meta/recipes-core/glib-2.0/glib.inc | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
index fbc655a012..f8e803a90a 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -121,6 +121,12 @@ RDEPENDS_${PN}-codegen += "\
             python3-xml \
            "
 
+RDEPENDS_${PN}-codegen_remove_mingw32 = "\
+            python3 \
+            python3-distutils \
+            python3-xml \
+           "
+
 RDEPENDS_${PN}-ptest += "\
             dbus \
             gnome-desktop-testing \
-- 
2.14.1

Re: [PATCH] glib-2.0: Remove python3 modules when building for mingw

[Richard Purdie]

On Tue, 2018-01-02 at 14:49 -0800, Alistair Francis wrote:
> Commit "glib-2.0: Add python3 modules required by gdbus-codegen"
> (26af3b4b33a34d7e53059b07236f9d5aae5e004a) broke the MinGW build of
> QEMU. To fix the build remove the python3 RDEPENDS for gdbus-codegen
> when targeting mingw.
> 
> Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>
> ---
>  meta/recipes-core/glib-2.0/glib.inc | 6 ++++++
>  1 file changed, 6 insertions(+)
> 
> diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-
> core/glib-2.0/glib.inc
> index fbc655a012..f8e803a90a 100644
> --- a/meta/recipes-core/glib-2.0/glib.inc
> +++ b/meta/recipes-core/glib-2.0/glib.inc
> @@ -121,6 +121,12 @@ RDEPENDS_${PN}-codegen += "\
>              python3-xml \
>             "
>  
> +RDEPENDS_${PN}-codegen_remove_mingw32 = "\
> +            python3 \
> +            python3-distutils \
> +            python3-xml \
> +           "
> +
>  RDEPENDS_${PN}-ptest += "\
>              dbus \
>              gnome-desktop-testing \

I have pretty strong feelings that we shouldn't be using remove like
this, or duplicating data. Its susceptible to breakage when one value
changes and the other does not. Can you rework this so it doesn't use
remove, or duplicate data?

In case its not clear, you can do something like:

CODEGEN_PYTHON_RDEPENDS = "python3 python3-distutils python3-xml"
CODEGEN_PYTHON_RDEPENDS_mingw32 = ""

RDEPENDS_${PN}-codegen += "${CODEGEN_PYTHON_RDEPENDS}"

which is much more maintainable.

Cheers,

Richard

Re: [PATCH] glib-2.0: Remove python3 modules when building for mingw

[Alistair Francis]

On Wed, Jan 3, 2018 at 2:54 AM, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
> On Tue, 2018-01-02 at 14:49 -0800, Alistair Francis wrote:
>> Commit "glib-2.0: Add python3 modules required by gdbus-codegen"
>> (26af3b4b33a34d7e53059b07236f9d5aae5e004a) broke the MinGW build of
>> QEMU. To fix the build remove the python3 RDEPENDS for gdbus-codegen
>> when targeting mingw.
>>
>> Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>
>> ---
>>  meta/recipes-core/glib-2.0/glib.inc | 6 ++++++
>>  1 file changed, 6 insertions(+)
>>
>> diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-
>> core/glib-2.0/glib.inc
>> index fbc655a012..f8e803a90a 100644
>> --- a/meta/recipes-core/glib-2.0/glib.inc
>> +++ b/meta/recipes-core/glib-2.0/glib.inc
>> @@ -121,6 +121,12 @@ RDEPENDS_${PN}-codegen += "\
>>              python3-xml \
>>             "
>>
>> +RDEPENDS_${PN}-codegen_remove_mingw32 = "\
>> +            python3 \
>> +            python3-distutils \
>> +            python3-xml \
>> +           "
>> +
>>  RDEPENDS_${PN}-ptest += "\
>>              dbus \
>>              gnome-desktop-testing \
>
> I have pretty strong feelings that we shouldn't be using remove like
> this, or duplicating data. Its susceptible to breakage when one value
> changes and the other does not. Can you rework this so it doesn't use
> remove, or duplicate data?
>
> In case its not clear, you can do something like:
>
> CODEGEN_PYTHON_RDEPENDS = "python3 python3-distutils python3-xml"
> CODEGEN_PYTHON_RDEPENDS_mingw32 = ""
>
> RDEPENDS_${PN}-codegen += "${CODEGEN_PYTHON_RDEPENDS}"
>
> which is much more maintainable.

Looks good to me, I'll send a v2.

Alistair

>
> Cheers,
>
> Richard
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core