NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix dependencies.

Browse Source
This commit is contained in:
Thomas Lundquist 2009-01-12 15:22:41 +00:00
parent 6e4c616df8
commit 8356803dcf
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package/cairo/Config.in
View File

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

8
package/cairo/cairo.mk
View File

@ -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_use_included_regex=no gl_cv_c_restrict=no \
ac_cv_path_GLIB_GENMARSHAL=$(HOST_GLIB)/bin/glib-genmarshal 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) ifeq ($(BR2_PACKAGE_DIRECTFB),y)
CAIRO_CONF_OPT = --disable-xlib --without-x --enable-directfb \ CAIRO_CONF_OPT = --disable-xlib --without-x --enable-directfb
--disable-gtk-doc --with-html-dir=/dev/null
CAIRO_DEPENDENCIES_EXTRA = directfb CAIRO_DEPENDENCIES_EXTRA = directfb
endif endif
CAIRO_CONF_OPT += --disable-gtk-doc --with-html-dir=/dev/null
CAIRO_DEPENDENCIES = uclibc gettext libintl pkgconfig zlib libpng fontconfig $(CAIRO_DEPENDENCIES_EXTRA) pixman $(XSERVER)
CAIRO_DEPENDENCIES = uclibc gettext libintl pkgconfig libglib2 zlib libpng fontconfig $(CAIRO_DEPENDENCIES_EXTRA) pixman $(XSERVER)
$(eval $(call AUTOTARGETS,package,cairo)) $(eval $(call AUTOTARGETS,package,cairo))