diff options
| author | Matthew Waters <matthew@centricular.com> | 2022-03-27 14:46:10 +1100 |
|---|---|---|
| committer | Matthew Waters <matthew@centricular.com> | 2022-03-28 11:35:04 +0000 |
| commit | 54fe049162c3eb18165d135a45934e77fa5e753c (patch) | |
| tree | 247ec774946bd98933b1fd10e18a0ac99293ca8d | |
| parent | 8a12729c547d1a652a769bc9746eed0eeafe18f5 (diff) | |
harfbuzz: disable werror from internal pragmas
Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/837>
| -rw-r--r-- | recipes/harfbuzz.recipe | 5 | ||||
| -rw-r--r-- | recipes/harfbuzz/0001-harfbuzz-disable-werror-from-pragmas.patch | 34 |
2 files changed, 38 insertions, 1 deletions
diff --git a/recipes/harfbuzz.recipe b/recipes/harfbuzz.recipe index 73b6b0cb..e8db6ee5 100644 --- a/recipes/harfbuzz.recipe +++ b/recipes/harfbuzz.recipe @@ -20,7 +20,10 @@ class Recipe(recipe.Recipe): 'tests': 'disabled'} # https://github.com/harfbuzz/harfbuzz/pull/2458 - patches = ['harfbuzz/0001-meson-Export-symbols-for-a-DLL-when-not-building-sta.patch'] + patches = [ + 'harfbuzz/0001-meson-Export-symbols-for-a-DLL-when-not-building-sta.patch', + 'harfbuzz/0001-harfbuzz-disable-werror-from-pragmas.patch', + ] files_bins = ['hb-ot-shape-closure', 'hb-view', 'hb-shape'] files_libs = ['libharfbuzz'] diff --git a/recipes/harfbuzz/0001-harfbuzz-disable-werror-from-pragmas.patch b/recipes/harfbuzz/0001-harfbuzz-disable-werror-from-pragmas.patch new file mode 100644 index 00000000..1846b8f4 --- /dev/null +++ b/recipes/harfbuzz/0001-harfbuzz-disable-werror-from-pragmas.patch @@ -0,0 +1,34 @@ +From 358b876830d4e93ab1822681254ba81548d9383b Mon Sep 17 00:00:00 2001 +From: Matthew Waters <matthew@centricular.com> +Date: Sun, 27 Mar 2022 14:39:11 +1100 +Subject: [PATCH] harfbuzz: disable werror from pragmas + +Currently fails building on macOS 12.3 and should actually be controlled +by the build system. +--- + src/hb.hh | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/hb.hh b/src/hb.hh +index 3adca88..aa07101 100644 +--- a/src/hb.hh ++++ b/src/hb.hh +@@ -62,6 +62,7 @@ + + /* Error. Should never happen. */ + #ifndef HB_NO_PRAGMA_GCC_DIAGNOSTIC_ERROR ++#if 0 + #pragma GCC diagnostic error "-Wc++11-narrowing" + #pragma GCC diagnostic error "-Wcast-align" + #pragma GCC diagnostic error "-Wcast-function-type" +@@ -93,6 +94,7 @@ + #pragma GCC diagnostic error "-Wvla" + #pragma GCC diagnostic error "-Wwrite-strings" + #endif ++#endif + + /* Warning. To be investigated if happens. */ + #ifndef HB_NO_PRAGMA_GCC_DIAGNOSTIC_WARNING +-- +2.32.0 (Apple Git-132) + |