* [PATCH 0/1] cairo: fix build error @ 2013-06-18 6:02 rongqing.li 2013-06-18 6:02 ` [PATCH 1/1] cairo: fix build error since toolchain has not get_feature command rongqing.li 0 siblings, 1 reply; 5+ messages in thread From: rongqing.li @ 2013-06-18 6:02 UTC (permalink / raw) To: openembedded-core From: "Roy.Li" <rongqing.li@windriver.com> 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 -- 1.7.10.4 ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/1] cairo: fix build error since toolchain has not get_feature command 2013-06-18 6:02 [PATCH 0/1] cairo: fix build error rongqing.li @ 2013-06-18 6:02 ` rongqing.li 2013-06-18 14:17 ` Mark Hatle 0 siblings, 1 reply; 5+ messages in thread From: rongqing.li @ 2013-06-18 6:02 UTC (permalink / raw) To: openembedded-core From: "Roy.Li" <rongqing.li@windriver.com> Signed-off-by: Roy.Li <rongqing.li@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.Li@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.Li@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 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 1/1] cairo: fix build error since toolchain has not get_feature command 2013-06-18 6:02 ` [PATCH 1/1] cairo: fix build error since toolchain has not get_feature command rongqing.li @ 2013-06-18 14:17 ` Mark Hatle 2013-06-18 15:19 ` Khem Raj 2013-06-19 2:46 ` Rongqing Li 0 siblings, 2 replies; 5+ messages in thread From: Mark Hatle @ 2013-06-18 14:17 UTC (permalink / raw) To: openembedded-core On 6/18/13 1:02 AM, rongqing.li@windriver.com wrote: > From: "Roy.Li" <rongqing.li@windriver.com> > > Signed-off-by: Roy.Li <rongqing.li@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.Li@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. 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 > +so let cairo don't check stderr,just check the return value of compiling > +is enough. > + > +Signed-off-by: Song.Li <Song.Li@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" > ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/1] cairo: fix build error since toolchain has not get_feature command 2013-06-18 14:17 ` Mark Hatle @ 2013-06-18 15:19 ` Khem Raj 2013-06-19 2:46 ` Rongqing Li 1 sibling, 0 replies; 5+ messages in thread From: Khem Raj @ 2013-06-18 15:19 UTC (permalink / raw) To: Mark Hatle; +Cc: <openembedded-core@lists.openembedded.org> On Jun 18, 2013, at 7:17 AM, Mark Hatle <mark.hatle@windriver.com> wrote: > On 6/18/13 1:02 AM, rongqing.li@windriver.com wrote: >> From: "Roy.Li" <rongqing.li@windriver.com> >> >> Signed-off-by: Roy.Li <rongqing.li@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.Li@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. > > 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 > I'd suggest just removing the example part. > > --Mark > >> +so let cairo don't check stderr,just check the return value of compiling >> +is enough. >> + >> +Signed-off-by: Song.Li <Song.Li@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" > > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/1] cairo: fix build error since toolchain has not get_feature command 2013-06-18 14:17 ` Mark Hatle 2013-06-18 15:19 ` Khem Raj @ 2013-06-19 2:46 ` Rongqing Li 1 sibling, 0 replies; 5+ messages in thread From: Rongqing Li @ 2013-06-19 2:46 UTC (permalink / raw) To: Mark Hatle; +Cc: openembedded-core On 06/18/2013 10:17 PM, Mark Hatle wrote: > On 6/18/13 1:02 AM, rongqing.li@windriver.com wrote: >> From: "Roy.Li" <rongqing.li@windriver.com> >> >> Signed-off-by: Roy.Li <rongqing.li@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.Li@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. > > 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 > I will drop this patch until the build failure happens on oe-core. -Roy >> +so let cairo don't check stderr,just check the return value of compiling >> +is enough. >> + >> +Signed-off-by: Song.Li <Song.Li@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" >> > > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core > > -- Best Reagrds, Roy | RongQing Li ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2013-06-19 2:46 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2013-06-18 6:02 [PATCH 0/1] cairo: fix build error rongqing.li 2013-06-18 6:02 ` [PATCH 1/1] cairo: fix build error since toolchain has not get_feature command rongqing.li 2013-06-18 14:17 ` Mark Hatle 2013-06-18 15:19 ` Khem Raj 2013-06-19 2:46 ` Rongqing Li
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox