Patchwork [1/1] cairo: fix build error since toolchain has not get_feature command

login
register
mail settings
Submitter rongqing.li@windriver.com
Date June 18, 2013, 6:02 a.m.
Message ID <0a46b955bf906f9ce2c6a9045c740ac44a1b0959.1371535277.git.rongqing.li@windriver.com>
Download mbox | patch
Permalink /patch/51877/
State New
Headers show

Comments

rongqing.li@windriver.com - June 18, 2013, 6:02 a.m.
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
Mark Hatle - June 18, 2013, 2:17 p.m.
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"
>
Khem Raj - June 18, 2013, 3:19 p.m.
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
rongqing.li@windriver.com - June 19, 2013, 2:46 a.m.
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
>
>

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"