diff options
| author | Matthew Waters <matthew@centricular.com> | 2019-10-01 20:19:23 +1000 |
|---|---|---|
| committer | Matthew Waters <matthew@centricular.com> | 2019-10-01 21:53:51 +1000 |
| commit | a2009e620ad75a0ff1503d5986ba3b640cb0ad4e (patch) | |
| tree | 388eafcc22e20f9a32b0e2058a8946e481b929e4 | |
| parent | 5fea1acc4bfd850cef8ab4c2f837084376de6543 (diff) | |
cairo: don't fail configure linker tests when stderr is output
macos' linker will output version mismatch warnings to stderr and fail
the check:
ld: warning: passed two min versions (10.0.0, 10.0) for platform iOS. Using 10.0.
| -rw-r--r-- | recipes/cairo.recipe | 1 | ||||
| -rw-r--r-- | recipes/cairo/0001-build-disable-failing-compile-link-checks-on-any-std.patch | 35 |
2 files changed, 36 insertions, 0 deletions
diff --git a/recipes/cairo.recipe b/recipes/cairo.recipe index 09e29f4f..320c6a8a 100644 --- a/recipes/cairo.recipe +++ b/recipes/cairo.recipe @@ -14,6 +14,7 @@ class Recipe(recipe.Recipe): 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-build-disable-failing-compile-link-checks-on-any-std.patch', ] files_libs = ['libcairo', 'libcairo-gobject', 'libcairo-script-interpreter'] diff --git a/recipes/cairo/0001-build-disable-failing-compile-link-checks-on-any-std.patch b/recipes/cairo/0001-build-disable-failing-compile-link-checks-on-any-std.patch new file mode 100644 index 00000000..86bd3733 --- /dev/null +++ b/recipes/cairo/0001-build-disable-failing-compile-link-checks-on-any-std.patch @@ -0,0 +1,35 @@ +From 4797ee1f567b83c1b3004ce1963f37a4ecdff3f3 Mon Sep 17 00:00:00 2001 +From: Matthew Waters <matthew@centricular.com> +Date: Tue, 1 Oct 2019 20:07:12 +1000 +Subject: [PATCH] build: disable failing compile/link checks on any stderr + output + +ld for ios will output a warning when passing the same min ios platform: + +ld: warning: passed two min versions (10.0.0, 10.0) for platform iOS. Using 10.0. + +and will cause every link check to fail +--- + build/aclocal.cairo.m4 | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/build/aclocal.cairo.m4 b/build/aclocal.cairo.m4 +index 44ba5fd..7f91ea4 100644 +--- a/build/aclocal.cairo.m4 ++++ b/build/aclocal.cairo.m4 +@@ -106,9 +106,9 @@ AC_DEFUN([CAIRO_CC_TRY_LINK_WITH_ENV_SILENT],[dnl + [cairo_cc_stderr=`test -f conftest.err && cat conftest.err` + cairo_cc_flag=no]) + +- if test "x$cairo_cc_stderr" != "x"; then +- cairo_cc_flag=no +- fi ++# if test "x$cairo_cc_stderr" != "x"; then ++# cairo_cc_flag=no ++# fi + + if test "x$cairo_cc_flag" = "xyes"; then + ifelse([$3], , :, [$3]) +-- +2.21.0 (Apple Git-122) + |