[Buildroot] [PATCH 1/2] package/avahi: drop unneeded am_cv_path_PYTHON

[Buildroot] [PATCH 1/2] package/avahi: drop unneeded am_cv_path_PYTHON

[Peter Korsgaard]

It is not used by the configure script and refer to PYTHON_TARGET_BINARY
which was dropped back in 2010 by commit e3418f69cf (python: convert to
autotargets, bump to 2.7.1, many improvements), so drop it.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/avahi/avahi.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk
index 13e2106014..04c4164af6 100644
--- a/package/avahi/avahi.mk
+++ b/package/avahi/avahi.mk
@@ -107,7 +107,6 @@ endif
 ifeq ($(BR2_PACKAGE_PYTHON),y)
 AVAHI_CONF_ENV += \
 	am_cv_pathless_PYTHON=python \
-	am_cv_path_PYTHON=$(PYTHON_TARGET_BINARY) \
 	am_cv_python_version=$(PYTHON_VERSION) \
 	am_cv_python_platform=linux2 \
 	am_cv_python_pythondir=/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages \
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 2/2] package/avahi: add pygobject support, move to python3

[Peter Korsgaard]

The python support in avahi needs pygobjet to do anything:

Building avahi-python:              no   (You need python, pygobject and python-dbus!)

So add optional support for it.  Python-gobject is only available for
python3, so change the python logic to use python 3.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/avahi/avahi.mk | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk
index 04c4164af6..1992669a92 100644
--- a/package/avahi/avahi.mk
+++ b/package/avahi/avahi.mk
@@ -40,7 +40,6 @@ AVAHI_CONF_OPTS = \
 	--disable-gtk \
 	--disable-gtk3 \
 	--disable-gdbm \
-	--disable-pygobject \
 	--disable-mono \
 	--disable-monodoc \
 	--disable-stack-protector \
@@ -104,16 +103,16 @@ else
 AVAHI_CONF_OPTS += --disable-glib --disable-gobject
 endif
 
-ifeq ($(BR2_PACKAGE_PYTHON),y)
+ifeq ($(BR2_PACKAGE_PYTHON3),y)
 AVAHI_CONF_ENV += \
-	am_cv_pathless_PYTHON=python \
-	am_cv_python_version=$(PYTHON_VERSION) \
-	am_cv_python_platform=linux2 \
-	am_cv_python_pythondir=/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages \
-	am_cv_python_pyexecdir=/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages \
+	am_cv_pathless_PYTHON=python3 \
+	am_cv_python_version=$(PYTHON3_VERSION) \
+	am_cv_python_platform=linux5 \
+	am_cv_python_pythondir=/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \
+	am_cv_python_pyexecdir=/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \
 	py_cv_mod_socket_=yes
 
-AVAHI_DEPENDENCIES += python
+AVAHI_DEPENDENCIES += python3
 AVAHI_CONF_OPTS += --enable-python
 else
 AVAHI_CONF_OPTS += --disable-python
@@ -127,6 +126,13 @@ else
 AVAHI_CONF_OPTS += --disable-python-dbus
 endif
 
+ifeq ($(BR2_PACKAGE_PYTHON_GOBJECT),y)
+AVAHI_CONF_OPTS += --enable-pygobject
+AVAHI_DEPENDENCIES += python-gobject
+else
+AVAHI_CONF_OPTS += --disable-pygobject
+endif
+
 AVAHI_CONF_ENV += CFLAGS="$(AVAHI_CFLAGS)"
 
 AVAHI_MAKE_OPTS += LIBS=$(TARGET_NLS_LIBS)
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 2/2] package/avahi: add pygobject support, move to python3

[Arnout Vandecappelle]

On 06/02/2022 10:45, Peter Korsgaard wrote:
> The python support in avahi needs pygobjet to do anything:
> 
> Building avahi-python:              no   (You need python, pygobject and python-dbus!)

  So, doesn't that mean that...

> 
> So add optional support for it.  Python-gobject is only available for
> python3, so change the python logic to use python 3.
> 
> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
> ---
>   package/avahi/avahi.mk | 22 ++++++++++++++--------
>   1 file changed, 14 insertions(+), 8 deletions(-)
> 
> diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk
> index 04c4164af6..1992669a92 100644
> --- a/package/avahi/avahi.mk
> +++ b/package/avahi/avahi.mk
> @@ -40,7 +40,6 @@ AVAHI_CONF_OPTS = \
>   	--disable-gtk \
>   	--disable-gtk3 \
>   	--disable-gdbm \
> -	--disable-pygobject \
>   	--disable-mono \
>   	--disable-monodoc \
>   	--disable-stack-protector \
> @@ -104,16 +103,16 @@ else
>   AVAHI_CONF_OPTS += --disable-glib --disable-gobject
>   endif
>   
> -ifeq ($(BR2_PACKAGE_PYTHON),y)
> +ifeq ($(BR2_PACKAGE_PYTHON3),y)

... this condition should be

ifeq ($(BR2_PACKAGE_PYTHON_GOBJECT)$(BR2_PACKAGE_PYTHON_DBUS_NEXT),yy)

(python3 is implied by python-gobject).

  If what I'm saying is true, then actually I'd go a bit further than that and add

	select BR2_PACKAGE_PYTHON_DBUS_NEXT if BR2_PACKAGE_PYTHON_GOBJECT

to Config.in. Automatically selecting python-gobject would go a little too far 
since it depends on gobject-introspection and we really don't want to enable 
that beast unless it's really needed...

  Regards,
  Arnout

>   AVAHI_CONF_ENV += \
> -	am_cv_pathless_PYTHON=python \
> -	am_cv_python_version=$(PYTHON_VERSION) \
> -	am_cv_python_platform=linux2 \
> -	am_cv_python_pythondir=/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages \
> -	am_cv_python_pyexecdir=/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages \
> +	am_cv_pathless_PYTHON=python3 \
> +	am_cv_python_version=$(PYTHON3_VERSION) \
> +	am_cv_python_platform=linux5 \
> +	am_cv_python_pythondir=/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \
> +	am_cv_python_pyexecdir=/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \
>   	py_cv_mod_socket_=yes
>   
> -AVAHI_DEPENDENCIES += python
> +AVAHI_DEPENDENCIES += python3
>   AVAHI_CONF_OPTS += --enable-python
>   else
>   AVAHI_CONF_OPTS += --disable-python
> @@ -127,6 +126,13 @@ else
>   AVAHI_CONF_OPTS += --disable-python-dbus
>   endif
>   
> +ifeq ($(BR2_PACKAGE_PYTHON_GOBJECT),y)
> +AVAHI_CONF_OPTS += --enable-pygobject
> +AVAHI_DEPENDENCIES += python-gobject
> +else
> +AVAHI_CONF_OPTS += --disable-pygobject
> +endif
> +
>   AVAHI_CONF_ENV += CFLAGS="$(AVAHI_CFLAGS)"
>   
>   AVAHI_MAKE_OPTS += LIBS=$(TARGET_NLS_LIBS)
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 2/2] package/avahi: add pygobject support, move to python3

[Arnout Vandecappelle]

On 06/02/2022 12:05, Arnout Vandecappelle wrote:
>
>
> On 06/02/2022 10:45, Peter Korsgaard wrote:
>> The python support in avahi needs pygobjet to do anything:
>>
>> Building avahi-python:              no   (You need python, pygobject and 
>> python-dbus!)
>
>  So, doesn't that mean that...
>
>>
>> So add optional support for it.  Python-gobject is only available for
>> python3, so change the python logic to use python 3.
>>
>> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
>> ---
>>   package/avahi/avahi.mk | 22 ++++++++++++++--------
>>   1 file changed, 14 insertions(+), 8 deletions(-)
>>
>> diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk
>> index 04c4164af6..1992669a92 100644
>> --- a/package/avahi/avahi.mk
>> +++ b/package/avahi/avahi.mk
>> @@ -40,7 +40,6 @@ AVAHI_CONF_OPTS = \
>>       --disable-gtk \
>>       --disable-gtk3 \
>>       --disable-gdbm \
>> -    --disable-pygobject \
>>       --disable-mono \
>>       --disable-monodoc \
>>       --disable-stack-protector \
>> @@ -104,16 +103,16 @@ else
>>   AVAHI_CONF_OPTS += --disable-glib --disable-gobject
>>   endif
>>   -ifeq ($(BR2_PACKAGE_PYTHON),y)
>> +ifeq ($(BR2_PACKAGE_PYTHON3),y)
>
> ... this condition should be
>
> ifeq ($(BR2_PACKAGE_PYTHON_GOBJECT)$(BR2_PACKAGE_PYTHON_DBUS_NEXT),yy)
>
> (python3 is implied by python-gobject).
>
>  If what I'm saying is true, then actually I'd go a bit further than that and add
>
>     select BR2_PACKAGE_PYTHON_DBUS_NEXT if BR2_PACKAGE_PYTHON_GOBJECT

  Actually, we could make it


     select BR2_PACKAGE_PYTHON_GOBJECT if BR2_PACKAGE_PYTHON3 && 
BR2_PACKAGE_GOBJECT_INTROSPECTION

     select BR2_PACKAGE_PYTHON_DBUS_NEXT if BR2_PACKAGE_PYTHON3 && 
BR2_PACKAGE_GOBJECT_INTROSPECTION

(with probably some comment to explain why the weird dependencies)

  Regards,
  Arnout

>
> to Config.in. Automatically selecting python-gobject would go a little too far 
> since it depends on gobject-introspection and we really don't want to enable 
> that beast unless it's really needed...
>
>  Regards,
>  Arnout
>
>>   AVAHI_CONF_ENV += \
>> -    am_cv_pathless_PYTHON=python \
>> -    am_cv_python_version=$(PYTHON_VERSION) \
>> -    am_cv_python_platform=linux2 \
>> - am_cv_python_pythondir=/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages \
>> - am_cv_python_pyexecdir=/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages \
>> +    am_cv_pathless_PYTHON=python3 \
>> +    am_cv_python_version=$(PYTHON3_VERSION) \
>> +    am_cv_python_platform=linux5 \
>> + am_cv_python_pythondir=/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \
>> + am_cv_python_pyexecdir=/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \
>>       py_cv_mod_socket_=yes
>>   -AVAHI_DEPENDENCIES += python
>> +AVAHI_DEPENDENCIES += python3
>>   AVAHI_CONF_OPTS += --enable-python
>>   else
>>   AVAHI_CONF_OPTS += --disable-python
>> @@ -127,6 +126,13 @@ else
>>   AVAHI_CONF_OPTS += --disable-python-dbus
>>   endif
>>   +ifeq ($(BR2_PACKAGE_PYTHON_GOBJECT),y)
>> +AVAHI_CONF_OPTS += --enable-pygobject
>> +AVAHI_DEPENDENCIES += python-gobject
>> +else
>> +AVAHI_CONF_OPTS += --disable-pygobject
>> +endif
>> +
>>   AVAHI_CONF_ENV += CFLAGS="$(AVAHI_CFLAGS)"
>>     AVAHI_MAKE_OPTS += LIBS=$(TARGET_NLS_LIBS)
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 2/2] package/avahi: add pygobject support, move to python3

[Peter Korsgaard]

>>>>> "Arnout" == Arnout Vandecappelle <arnout@mind.be> writes:

 > On 06/02/2022 10:45, Peter Korsgaard wrote:
 >> The python support in avahi needs pygobjet to do anything:
 >> 
 >> Building avahi-python:              no   (You need python, pygobject and python-dbus!)

 >  So, doesn't that mean that...

 >> -ifeq ($(BR2_PACKAGE_PYTHON),y)
 >> +ifeq ($(BR2_PACKAGE_PYTHON3),y)

 > ... this condition should be

 > ifeq ($(BR2_PACKAGE_PYTHON_GOBJECT)$(BR2_PACKAGE_PYTHON_DBUS_NEXT),yy)

 > (python3 is implied by python-gobject).

Well, it could - But there is no harm in passing --enable-python without
dbus/gobject, it will just not do anything.

Notice that it is dbus-python, not python-dbus-next.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/2] package/avahi: drop unneeded am_cv_path_PYTHON

[Peter Korsgaard]

>>>>> "Peter" == Peter Korsgaard <peter@korsgaard.com> writes:

 > It is not used by the configure script and refer to PYTHON_TARGET_BINARY
 > which was dropped back in 2010 by commit e3418f69cf (python: convert to
 > autotargets, bump to 2.7.1, many improvements), so drop it.

 > Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

Committed, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 2/2] package/avahi: add pygobject support, move to python3

[Peter Korsgaard]

>>>>> "Peter" == Peter Korsgaard <peter@korsgaard.com> writes:

 > The python support in avahi needs pygobjet to do anything:
 > Building avahi-python:              no   (You need python, pygobject and python-dbus!)

 > So add optional support for it.  Python-gobject is only available for
 > python3, so change the python logic to use python 3.

 > Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

Committed, thanks.

The further cleanup to only pass --enable-python if all the dependencies
are present can be done later.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot