diff mbox series

[2/5] package/gssdp: add optional dependency for gobject-introspection

Message ID 20200315172459.881615-2-aduskett@gmail.com
State Accepted
Headers show
Series [1/5] package/libsoup: add optional dependency for gobject-introspection | expand

Commit Message

Adam Duskett March 15, 2020, 5:24 p.m. UTC
From: Adam Duskett <Aduskett@gmail.com>

If gobject-introspection is selected, explicitly set -Dintrospection=true in
the configure options and add a dependency for gobject-introspection.

Signed-off-by: Adam Duskett <Aduskett@gmail.com>
---
 package/gssdp/gssdp.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

Comments

Thomas Petazzoni May 11, 2020, 5:19 a.m. UTC | #1
Hello,

On Sun, 15 Mar 2020 10:24:55 -0700
aduskett@gmail.com wrote:

> From: Adam Duskett <Aduskett@gmail.com>
> 
> If gobject-introspection is selected, explicitly set -Dintrospection=true in
> the configure options and add a dependency for gobject-introspection.
> 
> Signed-off-by: Adam Duskett <Aduskett@gmail.com>

The build of gssdp is broken with introspection support:

  /bin/sh: 1: /home/buildroot/autobuild/instance-2/output-1/host/bin/../nios2-buildroot-linux-gnu/sysroot/home/buildroot/autobuild/instance-2/output-1/host/bin/g-ir-scanner: not found

Could you have a look ?

I am wondering if this couldn't be a fallout of the recent changes in
the pkg-config Meson logic.

Thomas
Fabrice Fontaine May 11, 2020, 7:02 a.m. UTC | #2
Hi Thomas,

Le lun. 11 mai 2020 à 07:19, Thomas Petazzoni
<thomas.petazzoni@bootlin.com> a écrit :
>
> Hello,
>
> On Sun, 15 Mar 2020 10:24:55 -0700
> aduskett@gmail.com wrote:
>
> > From: Adam Duskett <Aduskett@gmail.com>
> >
> > If gobject-introspection is selected, explicitly set -Dintrospection=true in
> > the configure options and add a dependency for gobject-introspection.
> >
> > Signed-off-by: Adam Duskett <Aduskett@gmail.com>
>
> The build of gssdp is broken with introspection support:
>
>   /bin/sh: 1: /home/buildroot/autobuild/instance-2/output-1/host/bin/../nios2-buildroot-linux-gnu/sysroot/home/buildroot/autobuild/instance-2/output-1/host/bin/g-ir-scanner: not found
>
> Could you have a look ?
>
> I am wondering if this couldn't be a fallout of the recent changes in
> the pkg-config Meson logic.
James sent a patch that fix this build failure:
https://patchwork.ozlabs.org/project/buildroot/patch/20200502060435.23004-1-james.hilliard1@gmail.com.
The patch sent by James is fixing atk as well as many other meson
packages such as gssdp. However, it seems there was some debate on
this patch.
>
> Thomas
> --
> Thomas Petazzoni, CTO, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com
Best Regards,

Fabrice
Fabrice Fontaine May 11, 2020, 7:20 a.m. UTC | #3
Hi all,

Le lun. 11 mai 2020 à 09:02, Fabrice Fontaine
<fontaine.fabrice@gmail.com> a écrit :
>
> Hi Thomas,
>
> Le lun. 11 mai 2020 à 07:19, Thomas Petazzoni
> <thomas.petazzoni@bootlin.com> a écrit :
> >
> > Hello,
> >
> > On Sun, 15 Mar 2020 10:24:55 -0700
> > aduskett@gmail.com wrote:
> >
> > > From: Adam Duskett <Aduskett@gmail.com>
> > >
> > > If gobject-introspection is selected, explicitly set -Dintrospection=true in
> > > the configure options and add a dependency for gobject-introspection.
> > >
> > > Signed-off-by: Adam Duskett <Aduskett@gmail.com>
> >
> > The build of gssdp is broken with introspection support:
> >
> >   /bin/sh: 1: /home/buildroot/autobuild/instance-2/output-1/host/bin/../nios2-buildroot-linux-gnu/sysroot/home/buildroot/autobuild/instance-2/output-1/host/bin/g-ir-scanner: not found
> >
> > Could you have a look ?
> >
> > I am wondering if this couldn't be a fallout of the recent changes in
> > the pkg-config Meson logic.
> James sent a patch that fix this build failure:
> https://patchwork.ozlabs.org/project/buildroot/patch/20200502060435.23004-1-james.hilliard1@gmail.com.
> The patch sent by James is fixing atk as well as many other meson
> packages such as gssdp. However, it seems there was some debate on
> this patch.It seems that James suggested that a better solution would be to patch meson. This proposal was merged by meson a few days ago:
https://github.com/mesonbuild/meson/pull/7072/commits/0aa52b538fa678e2da1d0dedff800408e5e7afbb
James, could you provide a v2 of your patch?
> >
> > Thomas
> > --
> > Thomas Petazzoni, CTO, Bootlin
> > Embedded Linux and Kernel engineering
> > https://bootlin.com
> Best Regards,
>
> Fabrice
Best Regards,

Fabrice
James Hilliard May 11, 2020, 7:54 a.m. UTC | #4
On Mon, May 11, 2020 at 1:18 AM Fabrice Fontaine
<fontaine.fabrice@gmail.com> wrote:
>
> Hi all,
>
> Le lun. 11 mai 2020 à 09:02, Fabrice Fontaine
> <fontaine.fabrice@gmail.com> a écrit :
> >
> > Hi Thomas,
> >
> > Le lun. 11 mai 2020 à 07:19, Thomas Petazzoni
> > <thomas.petazzoni@bootlin.com> a écrit :
> > >
> > > Hello,
> > >
> > > On Sun, 15 Mar 2020 10:24:55 -0700
> > > aduskett@gmail.com wrote:
> > >
> > > > From: Adam Duskett <Aduskett@gmail.com>
> > > >
> > > > If gobject-introspection is selected, explicitly set -Dintrospection=true in
> > > > the configure options and add a dependency for gobject-introspection.
> > > >
> > > > Signed-off-by: Adam Duskett <Aduskett@gmail.com>
> > >
> > > The build of gssdp is broken with introspection support:
> > >
> > >   /bin/sh: 1: /home/buildroot/autobuild/instance-2/output-1/host/bin/../nios2-buildroot-linux-gnu/sysroot/home/buildroot/autobuild/instance-2/output-1/host/bin/g-ir-scanner: not found
> > >
> > > Could you have a look ?
> > >
> > > I am wondering if this couldn't be a fallout of the recent changes in
> > > the pkg-config Meson logic.
> > James sent a patch that fix this build failure:
> > https://patchwork.ozlabs.org/project/buildroot/patch/20200502060435.23004-1-james.hilliard1@gmail.com.
> > The patch sent by James is fixing atk as well as many other meson
> > packages such as gssdp. However, it seems there was some debate on
> > this patch.It seems that James suggested that a better solution would be to patch meson. This proposal was merged by meson a few days ago:
> https://github.com/mesonbuild/meson/pull/7072/commits/0aa52b538fa678e2da1d0dedff800408e5e7afbb
> James, could you provide a v2 of your patch?
I was waiting on it to get included in a meson release since it doesn't apply
to the latest release, seems the gnome module has been refactored quite
a bit since 0.54.1.
> > >
> > > Thomas
> > > --
> > > Thomas Petazzoni, CTO, Bootlin
> > > Embedded Linux and Kernel engineering
> > > https://bootlin.com
> > Best Regards,
> >
> > Fabrice
> Best Regards,
>
> Fabrice
diff mbox series

Patch

diff --git a/package/gssdp/gssdp.mk b/package/gssdp/gssdp.mk
index 071ad00109..bab3cbe0f7 100644
--- a/package/gssdp/gssdp.mk
+++ b/package/gssdp/gssdp.mk
@@ -14,9 +14,15 @@  GSSDP_INSTALL_STAGING = YES
 GSSDP_DEPENDENCIES = host-pkgconf libglib2 libsoup
 GSSDP_CONF_OPTS = \
 	-Dexamples=false \
-	-Dintrospection=false \
 	-Dvapi=false
 
+ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y)
+GSSDP_CONF_OPTS += -Dintrospection=true
+GSSDP_DEPENDENCIES += gobject-introspection
+else
+GSSDP_CONF_OPTS += -Dintrospection=false
+endif
+
 ifeq ($(BR2_PACKAGE_LIBGTK3),y)
 GSSDP_DEPENDENCIES += libgtk3
 GSSDP_CONF_OPTS += -Dsniffer=true