瀏覽代碼

package/gobject-introspection: don't depend on cairo

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>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Yann E. MORIN 10 月之前
父節點
當前提交
fc31199a92
共有 1 個文件被更改,包括 2 次插入8 次删除
  1. 2 8
      package/gobject-introspection/gobject-introspection.mk

+ 2 - 8
package/gobject-introspection/gobject-introspection.mk

@@ -45,14 +45,8 @@ GOBJECT_INTROSPECTION_CONF_OPTS = \
 	-Dgi_cross_binary_wrapper="$(STAGING_DIR)/usr/bin/g-ir-scanner-qemuwrapper" \
 	-Dgi_cross_ldd_wrapper="$(STAGING_DIR)/usr/bin/g-ir-scanner-lddwrapper" \
 	-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
+	-Ddoctool=disabled \
+	-Dcairo=disabled
 
 # GI_SCANNER_DISABLE_CACHE=1 prevents g-ir-scanner from writing cache data to ${HOME}
 GOBJECT_INTROSPECTION_CONF_ENV = \