cairo: fix build error
cover cairo: fix build error
From: "Roy.Li" <[email protected]>
The following changes since commit cf59801be372bda962a94e6a406e97d20744ae45:
licences: Add SGI license (2013-06-17 16:44:36 +0100)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib roy/cairo
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=roy/cairo
Roy.Li (1):
cairo: fix build error since toolchain has not get_feature command
...-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
Signature · 1 line
1.7.10.4
PATCH 1/1 cairo: fix build error since toolchain has not get_feature command
From: "Roy.Li" <[email protected]>
--- ...-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
meta/recipes-graphics/cairo/cairo/cairo-don-t-check-stderr-when-test-compiling-in-conf.patch new file +39 -0
@@ -0,0 +1,39 @@ +From 1581e5373c5917ed8ff6f7129c51160594c927d1 Mon Sep 17 00:00:00 2001 +From: "Song.Li" <[email protected]> +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 <[email protected]> +--- + 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 +
meta/recipes-graphics/cairo/cairo_1.12.14.bb +2 -1
@@ -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"
Signature · 1 line
1.7.10.4
Re: [PATCH 1/1] cairo: fix build error since toolchain has not get_feature command
Quoted 16 lines · On 6/18/13 1:02 AM, [email protected] wrote:
From: "Roy.Li" <[email protected]>
Signed-off-by Roy.Li <[email protected]>--- ...-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.patchmeta/recipes-graphics/cairo/cairo/cairo-don-t-check-stderr-when-test-compiling-in-conf.patch new file +1
-0@@ -0,0 +1,39 @@ +From 1581e5373c5917ed8ff6f7129c51160594c927d1 Mon Sep 17 00:00:00 2001
meta/recipes-graphics/cairo/cairo/cairo-don-t-check-stderr-when-test-compiling-in-conf.patch line 11
Quoted 10 lines
meta/recipes-graphics/cairo/cairo/cairo-don-t-check-stderr-when-test-compiling-in-conf.patch new file +10
-0+From: "Song.Li" <[email protected]> +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.
FYI -- 'get_feature' is something specific to Wind River. The patch is still reasonable, but the commit description might need some cleanup for people not familiar with some of our internal tools.
I'd suggest just removing the example part.
--Mark
Quoted 43 lines
meta/recipes-graphics/cairo/cairo/cairo-don-t-check-stderr-when-test-compiling-in-conf.patch new file +28
-0+so let cairo don't check stderr,just check the return value of compiling +is enough. + +Signed-off-by: Song.Li <[email protected]> +--- + 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 +meta/recipes-graphics/cairo/cairo_1.12.14.bb +2
-1@@ -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"
Re: [PATCH 1/1] cairo: fix build error since toolchain has not get_feature command
Quoted 21 lines · Mark Hatle
Quoted 20 lines · On 6/18/13 1:02 AM, [email protected] wrote:
From: "Roy.Li" <[email protected]>
Signed-off-by Roy.Li <[email protected]>--- ...-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.patchmeta/recipes-graphics/cairo/cairo/cairo-don-t-check-stderr-when-test-compiling-in-conf.patch new file +5
-0@@ -0,0 +1,39 @@ +From 1581e5373c5917ed8ff6f7129c51160594c927d1 Mon Sep 17 00:00:00 2001 +From: "Song.Li" <[email protected]> +Date: Mon, 30 Jul 2012 16:38:02 +0800 +Subject: [PATCH] cairo:don't check stderr when test compiling in configure +
Quoted 9 lines
meta/recipes-graphics/cairo/cairo/cairo-don-t-check-stderr-when-test-compiling-in-conf.patch line 11
Quoted 6 lines
meta/recipes-graphics/cairo/cairo/cairo-don-t-check-stderr-when-test-compiling-in-conf.patch new file +6
-0+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.FYI -- '
get_feature' is something specific to Wind River. The patch is still reasonable, but the commit description might need some cleanup for people not familiar with some of our internal tools.
I am still confused what does it fix in existing build
Quoted 51 lines
I'd suggest just removing the example part.
--Mark
Quoted 33 lines
meta/recipes-graphics/cairo/cairo/cairo-don-t-check-stderr-when-test-compiling-in-conf.patch new file +28
-0+so let cairo don't check stderr,just check the return value of compiling +is enough. + +Signed-off-by: Song.Li <[email protected]> +--- + 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 +meta/recipes-graphics/cairo/cairo_1.12.14.bb +0
-0meta/recipes-graphics/cairo/cairo_1.12.14.bb LIC_FILES_CHKSUM = "file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77" · line 12
Quoted 9 lines
meta/recipes-graphics/cairo/cairo_1.12.14.bb +2
-1@@ -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"_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [PATCH 1/1] cairo: fix build error since toolchain has not get_feature command
In reply to Mark HatleQuoted 41 lines · Mark Hatle
Quoted 28 lines · On 6/18/13 1:02 AM, [email protected] wrote:
From: "Roy.Li" <[email protected]>
Signed-off-by Roy.Li <[email protected]>--- ...-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.patchdiff --git
a/meta/recipes-graphics/cairo/cairo/cairo-don-t-check-stderr-when-test-compiling-in-conf.patchb/meta/recipes-graphics/cairo/cairo/cairo-don-t-check-stderr-when-test-compiling-in-conf.patchnew file mode 100644
index 0000000..e04c3b2
---/dev/null
+++b/meta/recipes-graphics/cairo/cairo/cairo-don-t-check-stderr-when-test-compiling-in-conf.patchmeta/recipes-graphics/cairo/cairo/cairo-don-t-check-stderr-when-test-compiling-in-conf.patch new file +4
-0@@ -0,0 +1,39 @@ +From 1581e5373c5917ed8ff6f7129c51160594c927d1 Mon Sep 17 00:00:00 2001 +From: "Song.Li" <[email protected]> +Date: Mon, 30 Jul 2012 16:38:02 +0800 +Subject: [PATCH] cairo:don't check stderr when test compiling inconfigure
meta/recipes-graphics/cairo/cairo/cairo-don-t-check-stderr-when-test-compiling-in-conf.patch line 11
Quoted 7 lines
meta/recipes-graphics/cairo/cairo/cairo-don-t-check-stderr-when-test-compiling-in-conf.patch new file +7
-0+ +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.FYI -- '
get_feature' is something specific to Wind River. The patch is still reasonable, but the commit description might need some cleanup for people not familiar with some of our internal tools.
Quoted 4 lines
I'd suggest just removing the example part.
--Mark
I will drop this patch until the build failure happens on oe-core.
-Roy
Quoted 54 lines
Quoted 43 lines
meta/recipes-graphics/cairo/cairo/cairo-don-t-check-stderr-when-test-compiling-in-conf.patch new file +28
-0+so let cairo don't check stderr,just check the return value of compiling +is enough. + +Signed-off-by: Song.Li <[email protected]> +--- + 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 +meta/recipes-graphics/cairo/cairo_1.12.14.bb +0
-0@@ -5,7 +5,8 @@ LIC_FILES_CHKSUM ="file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77"
PR = "r0"SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.xz \meta/recipes-graphics/cairo/cairo_1.12.14.bb +2
-1- file://png.patch" + file://png.patch \ +file://cairo-don-t-check-stderr-when-test-compiling-in-conf.patch"
Quoted 4 lines
SRC_URI[md5sum] = "
27b634113d0f52152d60ae8e2ec7daa7" SRC_URI[sha256sum] =
"96d0d1e3f9b74d2ca3469ff187c5e5f25649b1ad35cf06f4f3a83847dff4ac13"_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Signature · 2 lines
Best Reagrds, Roy | RongQing Li