浏览代码

Fix dependencies.

Thomas Lundquist 16 年之前
父节点
当前提交
8356803dcf
共有 2 个文件被更改,包括 4 次插入5 次删除
  1. 1 0
      package/cairo/Config.in
  2. 3 5
      package/cairo/cairo.mk

+ 1 - 0
package/cairo/Config.in

@@ -3,6 +3,7 @@ config BR2_PACKAGE_CAIRO
 	select BR2_PACKAGE_PKGCONFIG
 	select BR2_PACKAGE_LIBPNG
 	select BR2_PACKAGE_ZLIB
+	select BR2_PACKAGE_PIXMAN
 	select BR2_PACKAGE_FONTCONFIG
 	depends on BR2_PACKAGE_XORG||BR2_PACKAGE_XORG7||BR2_PACKAGE_TINYX||BR2_PACKAGE_DIRECTFB
 	help

+ 3 - 5
package/cairo/cairo.mk

@@ -41,15 +41,13 @@ CAIRO_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \
 		ac_use_included_regex=no gl_cv_c_restrict=no \
 		ac_cv_path_GLIB_GENMARSHAL=$(HOST_GLIB)/bin/glib-genmarshal
 
-CAIRO_CONF_OPT = --disable-gtk-doc --with-html-dir=/dev/null
 
 ifeq ($(BR2_PACKAGE_DIRECTFB),y)
-	CAIRO_CONF_OPT = --disable-xlib --without-x --enable-directfb \
-		--disable-gtk-doc --with-html-dir=/dev/null
+	CAIRO_CONF_OPT = --disable-xlib --without-x --enable-directfb
 	CAIRO_DEPENDENCIES_EXTRA = directfb
 endif
+CAIRO_CONF_OPT += --disable-gtk-doc --with-html-dir=/dev/null
 
-
-CAIRO_DEPENDENCIES = uclibc gettext libintl pkgconfig libglib2 zlib libpng fontconfig $(CAIRO_DEPENDENCIES_EXTRA) pixman $(XSERVER) 
+CAIRO_DEPENDENCIES = uclibc gettext libintl pkgconfig zlib libpng fontconfig $(CAIRO_DEPENDENCIES_EXTRA) pixman $(XSERVER) 
 
 $(eval $(call AUTOTARGETS,package,cairo))