diff options
| author | Sebastian Dröge <sebastian@centricular.com> | 2014-10-21 13:51:48 +0200 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2014-12-18 13:03:11 +0100 |
| commit | a7a9367b7c5c0312d1b5b28efcfc9ff462c58b53 (patch) | |
| tree | fed95dcb0cc11094eefb27449cb40b897d6ec09b | |
| parent | 5c364d20ccd0c020e69f5d931b533b828f6f404e (diff) | |
cairo: Disable testsuite build
The build system has some quirks and fails sometimes.
| -rw-r--r-- | recipes/cairo.recipe | 3 | ||||
| -rw-r--r-- | recipes/cairo/0001-Disable-building-of-the-tests.patch | 28 |
2 files changed, 30 insertions, 1 deletions
diff --git a/recipes/cairo.recipe b/recipes/cairo.recipe index 89febd0b..ef17cdc0 100644 --- a/recipes/cairo.recipe +++ b/recipes/cairo.recipe @@ -11,7 +11,8 @@ class Recipe(recipe.Recipe): autoreconf = True autoreconf_sh = 'NOCONFIGURE=1 ./autogen.sh' deps = ['glib', 'libpng', 'zlib', 'pixman', 'fontconfig', 'freetype'] - patches = ['cairo/0001-Fix-compilation-with-Android-s-bionic-libc.patch'] + patches = ['cairo/0001-Fix-compilation-with-Android-s-bionic-libc.patch', + 'cairo/0001-Disable-building-of-the-tests.patch'] files_libs = ['libcairo', 'libcairo-gobject', 'libcairo-script-interpreter'] files_devel = [ diff --git a/recipes/cairo/0001-Disable-building-of-the-tests.patch b/recipes/cairo/0001-Disable-building-of-the-tests.patch new file mode 100644 index 00000000..b99a03ee --- /dev/null +++ b/recipes/cairo/0001-Disable-building-of-the-tests.patch @@ -0,0 +1,28 @@ +From 2e60e3972ee8dadfebace50255c9275feae4dc6d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com> +Date: Tue, 21 Oct 2014 13:46:18 +0200 +Subject: [PATCH] Disable building of the tests + +We don't run them anyway and there are build system quirks in there. +--- + Makefile.am | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 03fa352..7e11d24 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -18,10 +18,6 @@ ACLOCAL_AMFLAGS = -I build ${ACLOCAL_FLAGS} + + DIST_SUBDIRS = src doc util boilerplate test perf + SUBDIRS = src doc util +-# libpng is required for our test programs +-if CAIRO_HAS_PNG_FUNCTIONS +-SUBDIRS += boilerplate test perf +-endif + + configure: cairo-version.h + +-- +2.1.1 + |