diff mbox series

[1/6,v3] package/gobject-introspection: don't depend on cairo

Message ID 3e75739fad18fd52de513761ef94139a922511be.1725225634.git.yann.morin.1998@free.fr
State New
Headers show
Series From: "Fiona Klute (WIWA)" <fiona.klute@gmx.de> (branch yem/libglib2) | expand

Commit Message

Yann E. MORIN Sept. 1, 2024, 9:20 p.m. UTC
Currently, goi depends on cairo.

So far, this would not cause any issue, but once we bump libglib2 and
goi, that would cause a circular dependency chain, where goi would
depend on cairo, cairo on libglib2, and libglib2 back on goi...

However, in goi, cairo is only needed to build some tests, and thus we
do not need that dependency, even before we update goi+libglib2.

Thanks to Fiona for helping sorting the issue out.

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Cc: Adam Duskett <adam.duskett@amarulasolutions.com>
Cc: Fiona Klute (WIWA) <fiona.klute@gmx.de>
---
 package/gobject-introspection/gobject-introspection.mk | 5 -----
 1 file changed, 5 deletions(-)
diff mbox series

Patch

diff --git a/package/gobject-introspection/gobject-introspection.mk b/package/gobject-introspection/gobject-introspection.mk
index ad72af22a2..af27781cf7 100644
--- a/package/gobject-introspection/gobject-introspection.mk
+++ b/package/gobject-introspection/gobject-introspection.mk
@@ -47,12 +47,7 @@  GOBJECT_INTROSPECTION_CONF_OPTS = \
 	-Dbuild_introspection_data=true \
 	-Ddoctool=disabled
 
-ifeq ($(BR2_PACKAGE_CAIRO),y)
-GOBJECT_INTROSPECTION_DEPENDENCIES += cairo
-GOBJECT_INTROSPECTION_CONF_OPTS += -Dcairo=enabled
-else
 GOBJECT_INTROSPECTION_CONF_OPTS += -Dcairo=disabled
-endif
 
 # GI_SCANNER_DISABLE_CACHE=1 prevents g-ir-scanner from writing cache data to ${HOME}
 GOBJECT_INTROSPECTION_CONF_ENV = \