forked from NixOS/nixpkgs
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge NixOS#100886: cairo: fix build on darwin
- Loading branch information
Showing
2 changed files
with
92 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
89 changes: 89 additions & 0 deletions
89
pkgs/development/libraries/cairo/skip-configure-stderr-check.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,89 @@ | ||
| https://bugs.freedesktop.org/show_bug.cgi?id=30910#c6 | ||
|
|
||
| Comment 6 Jeremy Huddleston Sequoia 2014-07-15 04:12:40 UTC | ||
|
|
||
| Yes, it is still an issue. We just disable the buggy '"x$cairo_cc_stderr" != "x"' logic, but that's not really a portable solution for you: | ||
|
|
||
| diff -Naurp cairo-1.12.2.orig/configure cairo-1.12.2/configure | ||
| --- cairo-1.12.2.orig/configure 2012-04-29 11:49:59.000000000 -0700 | ||
| +++ cairo-1.12.2/configure 2012-05-03 11:23:49.000000000 -0700 | ||
| @@ -18044,7 +18044,7 @@ fi | ||
| rm -f core conftest.err conftest.$ac_objext \ | ||
| conftest$ac_exeext conftest.$ac_ext | ||
|
|
||
| - if test "x$cairo_cc_stderr" != "x"; then | ||
| + if false; then | ||
| cairo_cc_flag=no | ||
| fi | ||
|
|
||
| @@ -18091,7 +18091,7 @@ fi | ||
| rm -f core conftest.err conftest.$ac_objext \ | ||
| conftest$ac_exeext conftest.$ac_ext | ||
|
|
||
| - if test "x$cairo_cc_stderr" != "x"; then | ||
| + if false; then | ||
| cairo_cc_flag=no | ||
| fi | ||
|
|
||
| @@ -18161,7 +18161,7 @@ fi | ||
| rm -f core conftest.err conftest.$ac_objext \ | ||
| conftest$ac_exeext conftest.$ac_ext | ||
|
|
||
| - if test "x$cairo_cc_stderr" != "x"; then | ||
| + if false; then | ||
| cairo_cc_flag=no | ||
| fi | ||
|
|
||
| @@ -18217,7 +18217,7 @@ fi | ||
| rm -f core conftest.err conftest.$ac_objext \ | ||
| conftest$ac_exeext conftest.$ac_ext | ||
|
|
||
| - if test "x$cairo_cc_stderr" != "x"; then | ||
| + if false; then | ||
| cairo_cc_flag=no | ||
| fi | ||
|
|
||
| @@ -19663,7 +19663,7 @@ fi | ||
| rm -f core conftest.err conftest.$ac_objext \ | ||
| conftest$ac_exeext conftest.$ac_ext | ||
|
|
||
| - if test "x$cairo_cc_stderr" != "x"; then | ||
| + if false; then | ||
| cairo_cc_flag=no | ||
| fi | ||
|
|
||
| @@ -19710,7 +19710,7 @@ fi | ||
| rm -f core conftest.err conftest.$ac_objext \ | ||
| conftest$ac_exeext conftest.$ac_ext | ||
|
|
||
| - if test "x$cairo_cc_stderr" != "x"; then | ||
| + if false; then | ||
| cairo_cc_flag=no | ||
| fi | ||
|
|
||
| @@ -32692,7 +32692,7 @@ fi | ||
| rm -f core conftest.err conftest.$ac_objext \ | ||
| conftest$ac_exeext conftest.$ac_ext | ||
|
|
||
| - if test "x$cairo_cc_stderr" != "x"; then | ||
| + if false; then | ||
| cairo_cc_flag=no | ||
| fi | ||
|
|
||
| @@ -32811,7 +32811,7 @@ fi | ||
| rm -f core conftest.err conftest.$ac_objext \ | ||
| conftest$ac_exeext conftest.$ac_ext | ||
|
|
||
| - if test "x$cairo_cc_stderr" != "x"; then | ||
| + if false ; then | ||
| cairo_cc_flag=no | ||
| fi | ||
|
|
||
| @@ -32892,7 +32892,7 @@ fi | ||
| rm -f core conftest.err conftest.$ac_objext \ | ||
| conftest$ac_exeext conftest.$ac_ext | ||
|
|
||
| - if test "x$cairo_cc_stderr" != "x"; then | ||
| + if false; then | ||
| cairo_cc_flag=no | ||
| fi |