From: "Roy.Li" <rongqing...@windriver.com> Signed-off-by: Roy.Li <rongqing...@windriver.com> --- ...-check-stderr-when-test-compiling-in-conf.patch | 39 ++++++++++++++++++++ meta/recipes-graphics/cairo/cairo_1.12.14.bb | 3 +- 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-graphics/cairo/cairo/cairo-don-t-check-stderr-when-test-compiling-in-conf.patch
diff --git a/meta/recipes-graphics/cairo/cairo/cairo-don-t-check-stderr-when-test-compiling-in-conf.patch b/meta/recipes-graphics/cairo/cairo/cairo-don-t-check-stderr-when-test-compiling-in-conf.patch new file mode 100644 index 0000000..e04c3b2 --- /dev/null +++ b/meta/recipes-graphics/cairo/cairo/cairo-don-t-check-stderr-when-test-compiling-in-conf.patch @@ -0,0 +1,39 @@ +From 1581e5373c5917ed8ff6f7129c51160594c927d1 Mon Sep 17 00:00:00 2001 +From: "Song.Li" <song...@windriver.com> +Date: Mon, 30 Jul 2012 16:38:02 +0800 +Subject: [PATCH] cairo:don't check stderr when test compiling in configure + +Upstream-Status: Pending + +cairo configure use a special macro to test compiling feature. +It'll require no any warnings or errors in stderr.That is too strict. +for example, when there is no get_feature in gcc, +gcc will print "no get_feature" in stderr, but that is not a real error. +so let cairo don't check stderr,just check the return value of compiling +is enough. + +Signed-off-by: Song.Li <song...@windriver.com> +--- + 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 592e168..4de3b26 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 ++dnl if test "x$cairo_cc_stderr" != "x"; then ++dnl cairo_cc_flag=no ++dnl fi + + if test "x$cairo_cc_flag" = "xyes"; then + ifelse([$3], , :, [$3]) +-- +1.7.9.5 + diff --git a/meta/recipes-graphics/cairo/cairo_1.12.14.bb b/meta/recipes-graphics/cairo/cairo_1.12.14.bb index 40aa169..5c8c9cd 100644 --- a/meta/recipes-graphics/cairo/cairo_1.12.14.bb +++ b/meta/recipes-graphics/cairo/cairo_1.12.14.bb @@ -5,7 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77" PR = "r0" SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.xz \ - file://png.patch" + file://png.patch \ + file://cairo-don-t-check-stderr-when-test-compiling-in-conf.patch" SRC_URI[md5sum] = "27b634113d0f52152d60ae8e2ec7daa7" SRC_URI[sha256sum] = "96d0d1e3f9b74d2ca3469ff187c5e5f25649b1ad35cf06f4f3a83847dff4ac13" -- 1.7.10.4 _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
