diff options
| author | Sebastian Dröge <sebastian@centricular.com> | 2014-11-08 00:48:11 +0100 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2014-11-08 00:54:01 +0100 |
| commit | 12f336518e66e1cfb6edb6ce122d0fe2e38dddbb (patch) | |
| tree | 59cdbee37870e72d4656acd9db3530616b9040e3 | |
| parent | 2a512371183c110d67064b4785d599ea6a44081e (diff) | |
harfbuzz: Fix compilation on iOS with XCode 6.1
| -rw-r--r-- | recipes/harfbuzz.recipe | 2 | ||||
| -rw-r--r-- | recipes/harfbuzz/0001-Don-t-use-mstructure-size-boundary-8.patch | 31 |
2 files changed, 33 insertions, 0 deletions
diff --git a/recipes/harfbuzz.recipe b/recipes/harfbuzz.recipe index 9c8b894f..596521aa 100644 --- a/recipes/harfbuzz.recipe +++ b/recipes/harfbuzz.recipe @@ -9,6 +9,8 @@ class Recipe(recipe.Recipe): licenses = [License.LGPLv2Plus] deps = ['fontconfig', 'cairo', 'glib'] configure_options = "--enable-static " + patches = ['harfbuzz/0001-Don-t-use-mstructure-size-boundary-8.patch'] + autoreconf = True files_bins = ['hb-ot-shape-closure', 'hb-view', 'hb-shape'] files_libs = ['libharfbuzz'] diff --git a/recipes/harfbuzz/0001-Don-t-use-mstructure-size-boundary-8.patch b/recipes/harfbuzz/0001-Don-t-use-mstructure-size-boundary-8.patch new file mode 100644 index 00000000..eff1e97b --- /dev/null +++ b/recipes/harfbuzz/0001-Don-t-use-mstructure-size-boundary-8.patch @@ -0,0 +1,31 @@ +From 1789d5507a208734f62471d2e20ed48a8c5f9bd1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com> +Date: Fri, 7 Nov 2014 20:27:49 +0100 +Subject: [PATCH] Don't use -mstructure-size-boundary=8 + +It does not exist on clang. +--- + configure.ac | 7 ------- + 1 file changed, 7 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 7b804b2..561c7cb 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -88,13 +88,6 @@ if test "x$GCC" = "xyes"; then + CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden" + ;; + esac +- +- case "$host" in +- arm-*-*) +- # Request byte alignment on arm +- CXXFLAGS="$CXXFLAGS -mstructure-size-boundary=8" +- ;; +- esac + fi + + AM_CONDITIONAL(HAVE_GCC, test "x$GCC" = "xyes") +-- +1.9.3 (Apple Git-50) + |