diff options
| author | Sebastian Dröge <sebastian@centricular.com> | 2014-10-21 17:32:05 +0200 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2014-10-21 17:32:05 +0200 |
| commit | 1142e73087f089ca2589b1cb96ad62b4e8195e09 (patch) | |
| tree | cf4951a22448466863e3855667b2d252f2755b0e /recipes | |
| parent | ab1f07e15efb9f86e8c5cd024b92a1b349732465 (diff) | |
cairo: Disable LTO as it breaks at least on Android
It results in static libraries without any symbols at all.
Diffstat (limited to 'recipes')
| -rw-r--r-- | recipes/cairo.recipe | 3 | ||||
| -rw-r--r-- | recipes/cairo/0001-configure-Disable-LTO-as-it-breaks-at-least-on-Andro.patch | 35 |
2 files changed, 37 insertions, 1 deletions
diff --git a/recipes/cairo.recipe b/recipes/cairo.recipe index ef17cdc0..12ece1ce 100644 --- a/recipes/cairo.recipe +++ b/recipes/cairo.recipe @@ -12,7 +12,8 @@ class Recipe(recipe.Recipe): autoreconf_sh = 'NOCONFIGURE=1 ./autogen.sh' deps = ['glib', 'libpng', 'zlib', 'pixman', 'fontconfig', 'freetype'] patches = ['cairo/0001-Fix-compilation-with-Android-s-bionic-libc.patch', - 'cairo/0001-Disable-building-of-the-tests.patch'] + 'cairo/0001-Disable-building-of-the-tests.patch', + 'cairo/0001-configure-Disable-LTO-as-it-breaks-at-least-on-Andro.patch'] files_libs = ['libcairo', 'libcairo-gobject', 'libcairo-script-interpreter'] files_devel = [ diff --git a/recipes/cairo/0001-configure-Disable-LTO-as-it-breaks-at-least-on-Andro.patch b/recipes/cairo/0001-configure-Disable-LTO-as-it-breaks-at-least-on-Andro.patch new file mode 100644 index 00000000..1838e076 --- /dev/null +++ b/recipes/cairo/0001-configure-Disable-LTO-as-it-breaks-at-least-on-Andro.patch @@ -0,0 +1,35 @@ +From 843c670539cd648fbda25e7cc864950c0709df66 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com> +Date: Tue, 21 Oct 2014 17:28:47 +0200 +Subject: [PATCH] configure: Disable LTO as it breaks at least on Android + +Results in a static library without any symbols at all. +--- + build/configure.ac.warnings | 11 ----------- + 1 file changed, 11 deletions(-) + +diff --git a/build/configure.ac.warnings b/build/configure.ac.warnings +index f984eb2..2c4e34d 100644 +--- a/build/configure.ac.warnings ++++ b/build/configure.ac.warnings +@@ -35,17 +35,6 @@ MAYBE_WARN="$MAYBE_WARN -erroff=E_ENUM_TYPE_MISMATCH_ARG \ + + dnl We also abuse the warning-flag facility to enable other compiler + dnl options. Namely, the following: +- +-dnl -flto working really needs a test link, not just a compile +- +-safe_MAYBE_WARN="$MAYBE_WARN" +-MAYBE_WARN="$MAYBE_WARN -flto" +-AC_TRY_LINK([],[ +- int main(int argc, char **argv) { return 0; } +-],[],[ +- MAYBE_WARN="$safe_MAYBE_WARN" +-]) +- + MAYBE_WARN="$MAYBE_WARN -fno-strict-aliasing -fno-common" + + dnl Also to turn various gcc/glibc-specific preprocessor checks +-- +2.1.1 + |