Bladeren bron

Fix #3584, when building cairo with DirectFB, depend on DirectFB

Thiago A. Corrêa 17 jaren geleden
bovenliggende
commit
6bab53cb89
2 gewijzigde bestanden met toevoegingen van 3 en 2 verwijderingen
  1. 1 1
      package/cairo/Config.in
  2. 2 1
      package/cairo/cairo.mk

+ 1 - 1
package/cairo/Config.in

@@ -5,7 +5,7 @@ config BR2_PACKAGE_CAIRO
 	select BR2_PACKAGE_LIBPNG
 	select BR2_PACKAGE_ZLIB
 	select BR2_PACKAGE_FONTCONFIG
-	depends on BR2_PACKAGE_XORG||BR2_PACKAGE_XORG7||BR2_PACKAGE_TINYX
+	depends on BR2_PACKAGE_XORG||BR2_PACKAGE_XORG7||BR2_PACKAGE_TINYX||BR2_PACKAGE_DIRECTFB
 	help
 	  Cairo is a 2D graphics library with support for multiple
 	  output devices. Currently supported output targets include

+ 2 - 1
package/cairo/cairo.mk

@@ -43,8 +43,9 @@ CAIRO_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \
 
 ifeq ($(BR2_PACKAGE_DIRECTFB),y)
 	CAIRO_CONF_OPT = --disable-xlib --without-x --enable-directfb
+	CAIRO_DEPENDENCIES_EXTRA = directfb
 endif
 
-CAIRO_DEPENDENCIES = uclibc gettext libintl pkgconfig libglib2 zlib png fontconfig $(XSERVER) 
+CAIRO_DEPENDENCIES = uclibc gettext libintl pkgconfig libglib2 zlib png fontconfig $(CAIRO_DEPENDENCIES_EXTRA) $(XSERVER) 
 
 $(eval $(call AUTOTARGETS,package,cairo))