Filter out fairly pointless ld warning from crt1.o (!) in the 10.4 SDK

Unfortunately the pixman and cairo configury consider any non-empty
stderr indicating an error, even if it just a warning and the exit
status of the command is success.

Change-Id: I921f72fcfc127d9c34a8db448926e478a82646d6
This commit is contained in:
Tor Lillqvist 2012-10-14 21:47:44 +03:00
parent 0683f53d01
commit 22bf1df8ca
2 changed files with 18 additions and 0 deletions

View File

@ -189,6 +189,15 @@
cairo_cv_xml_use=$use_xml
cairo_cv_xml_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS"
@@ -32864,7 +32864,7 @@
$_compile_program
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- cairo_cc_stderr=`test -f conftest.err && cat conftest.err`
+ cairo_cc_stderr=`test -f conftest.err && grep -v 'ld: warning: object file compiled with -mlong-branch which is no longer needed.' conftest.err`
cairo_cc_flag=yes
else
cairo_cc_stderr=`test -f conftest.err && cat conftest.err`
--- misc/cairo-1.10.2/src/cairo-deflate-stream.c 2010-06-18 13:47:12.000000000 +0200
+++ misc/build/cairo-1.10.2/src/cairo-deflate-stream.c 2010-06-18 13:47:12.000000000 +0200
@@ -37,7 +37,11 @@

View File

@ -112,6 +112,15 @@
{ $as_echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
if test "${ac_cv_c_bigendian+set}" = set; then
@@ -24552,7 +24552,7 @@
test "$cross_compiling" = yes ||
$as_test_x conftest$ac_exeext
}; then
- pixman_cc_stderr=`test -f conftest.err && cat conftest.err`
+ pixman_cc_stderr=`test -f conftest.err && grep -v 'ld: warning: object file compiled with -mlong-branch which is no longer needed.' conftest.err`
pixman_cc_flag=yes
else
$as_echo "$as_me: failed program was:" >&5
--- misc/pixman-0.24.4/pixman/pixman-utils.c
+++ misc/build/pixman-0.24.4/pixman/pixman-utils.c
@@ -27,6 +27,7 @@