diff options
| author | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2011-06-03 23:38:08 +0200 |
|---|---|---|
| committer | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2011-06-03 23:38:08 +0200 |
| commit | 566708c52765f789902e683452f81d8d4efe23a8 (patch) | |
| tree | 751e1f7b59b0cbe5ef28af76b9c4eebc6de6cf6c /packages | |
| parent | e2c2687897a19c3f3bfd5a404ef51f0c53569e6f (diff) | |
| download | embtoolkit-566708c52765f789902e683452f81d8d4efe23a8.tar.gz embtoolkit-566708c52765f789902e683452f81d8d4efe23a8.tar.bz2 embtoolkit-566708c52765f789902e683452f81d8d4efe23a8.tar.xz | |
Packages: cairo: remove cairo-1.10.2 as it fails to check pthread correctly
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/graphics/cairo/cairo.kconfig | 3 | ||||
| -rw-r--r-- | packages/graphics/cairo/cairo.mk | 19 |
2 files changed, 10 insertions, 12 deletions
diff --git a/packages/graphics/cairo/cairo.kconfig b/packages/graphics/cairo/cairo.kconfig index 43b363e..cc5bdf1 100644 --- a/packages/graphics/cairo/cairo.kconfig +++ b/packages/graphics/cairo/cairo.kconfig @@ -53,8 +53,6 @@ choice help Here you can choose which version of cairo you want to use. - config EMBTK_CAIRO_VERSION_1_10_2 - bool "cairo-1.10.2" config EMBTK_CAIRO_VERSION_1_8_10 bool "cairo-1.8.10" config EMBTK_CAIRO_VERSION_1_8_9 @@ -65,7 +63,6 @@ endchoice config EMBTK_CAIRO_VERSION_STRING string - default "1.10.2" if EMBTK_CAIRO_VERSION_1_10_2 default "1.8.10" if EMBTK_CAIRO_VERSION_1_8_10 default "1.8.9" if EMBTK_CAIRO_VERSION_1_8_9 default "1.8.8" if EMBTK_CAIRO_VERSION_1_8_8 diff --git a/packages/graphics/cairo/cairo.mk b/packages/graphics/cairo/cairo.mk index d6f1f00..7d2df69 100644 --- a/packages/graphics/cairo/cairo.mk +++ b/packages/graphics/cairo/cairo.mk @@ -23,14 +23,14 @@ # \date December 2009 ################################################################################ -CAIRO_NAME := cairo -CAIRO_VERSION := $(call EMBTK_GET_PKG_VERSION,CAIRO) -CAIRO_SITE := http://www.cairographics.org/releases -CAIRO_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror -CAIRO_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/cairo/$(CAIRO_VERSION) -CAIRO_PACKAGE := cairo-$(CAIRO_VERSION).tar.gz -CAIRO_SRC_DIR := $(PACKAGES_BUILD)/cairo-$(CAIRO_VERSION) -CAIRO_BUILD_DIR := $(PACKAGES_BUILD)/cairo-$(CAIRO_VERSION) +CAIRO_NAME := cairo +CAIRO_VERSION := $(call EMBTK_GET_PKG_VERSION,CAIRO) +CAIRO_SITE := http://www.cairographics.org/releases +CAIRO_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror +CAIRO_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/cairo/$(CAIRO_VERSION) +CAIRO_PACKAGE := cairo-$(CAIRO_VERSION).tar.gz +CAIRO_SRC_DIR := $(PACKAGES_BUILD)/cairo-$(CAIRO_VERSION) +CAIRO_BUILD_DIR := $(PACKAGES_BUILD)/cairo-$(CAIRO_VERSION) CAIRO_BINS = CAIRO_SBINS = @@ -57,7 +57,8 @@ CAIRO_CONFIG_OPTS-n += --enable-xcb=no CAIRO_CONFIG_OPTS-n += --without-x endif -CAIRO_CONFIGURE_OPTS := $(CAIRO_CONFIG_OPTS-n) $(CAIRO_CONFIG_OPTS-y) +CAIRO_CONFIGURE_OPTS := $(CAIRO_CONFIG_OPTS-n) $(CAIRO_CONFIG_OPTS-y) \ + --enable-pthread=yes cairo_install: $(call EMBTK_INSTALL_PKG,CAIRO) |