|
1 Patch configure; it assumes gcc -pthread option when testing for pthread |
|
2 support. Even more silly, the various configure tests will fail if there's |
|
3 any output to stderr -- warnings or not. |
|
4 |
|
5 This patch is not appropriate for upstream; a bug needs to be filed as |
|
6 their configure check needs to be completely reworked. |
|
7 |
|
8 --- cairo-1.14.2/build/configure.ac.pthread 2015-03-10 15:21:07.000000000 -0700 |
|
9 +++ cairo-1.14.2/build/configure.ac.pthread 2015-07-09 20:42:12.984139231 -0700 |
|
10 @@ -205,7 +205,7 @@ |
|
11 if test "x$have_real_pthread" != "xyes"; then |
|
12 dnl Give -pthread a go. |
|
13 CAIRO_CHECK_PTHREAD( |
|
14 - [real_pthread], [-pthread], [], |
|
15 + [real_pthread], [], [], |
|
16 [testsuite_pthread_program], |
|
17 [have_real_pthread=yes], |
|
18 [have_real_pthread="no (can't link with -lpthread or -pthread)"]) |
|
19 --- cairo-1.14.2/build/aclocal.cairo.m4 2015-03-10 15:21:07.000000000 -0700 |
|
20 +++ cairo-1.14.2/build/aclocal.cairo.m4 2015-07-10 19:47:09.816089024 -0700 |
|
21 @@ -80,8 +80,7 @@ |
|
22 dnl |
|
23 dnl Compile and link the program with the given environment setup. |
|
24 dnl The global cairo_cc_flag is set to "yes" or "no" according as |
|
25 -dnl the link succeeded or not. The link step must complete without |
|
26 -dnl warnings or errors to stderr. |
|
27 +dnl the link succeeded or not. |
|
28 dnl |
|
29 dnl Perform true-action on success and false-action on failure. |
|
30 dnl The values of CFLAGS, LIBS, LDFLAGS are saved before env-setup |
|
31 @@ -106,10 +105,6 @@ |
|
32 [cairo_cc_stderr=`test -f conftest.err && cat conftest.err` |
|
33 cairo_cc_flag=no]) |
|
34 |
|
35 - if test "x$cairo_cc_stderr" != "x"; then |
|
36 - cairo_cc_flag=no |
|
37 - fi |
|
38 - |
|
39 if test "x$cairo_cc_flag" = "xyes"; then |
|
40 ifelse([$3], , :, [$3]) |
|
41 else |