Attachment 77338 Details for Bug 63043 – build-sys: do not try to build util/sphinx on Windows

[patch] build-sys: do not try to build util/sphinx on Windows

0001-build-sys-do-not-try-to-build-util-sphinx-on-Windows.patch (text/plain), 1.21 KB, created by Marc-Andre Lureau on 2013-04-02 19:22:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marc-Andre Lureau

Created: 2013-04-02 19:22:25 UTC

Size: 1.21 KB

patch

obsolete

>From 4b69464dde07f2d5c23664499cb61ac984344e66 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@gmail.com>
>Date: Tue, 2 Apr 2013 21:00:20 +0200
>Subject: [PATCH] build-sys: do not try to build util/sphinx on Windows
>
>glib and dlfcn exist on windows, but sphinx code uses a lot of
>Unix-only API
>
>Fixes the following build error on mingw-fedora
>
>  CC     cairo-boilerplate-system.lo
>../../../util/cairo-sphinx/sphinx.c:8:22: fatal error: sys/mman.h: No such file or directory
>compilation terminated.
>
>https://bugs.freedesktop.org/show_bug.cgi?id=63043
>
>https://bugs.freedesktop.org/show_bug.cgi?id=63044
>---
> configure.ac | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/configure.ac b/configure.ac
>index 928a169..9a9be60 100644
>--- a/configure.ac
>+++ b/configure.ac
>@@ -797,7 +797,7 @@ CAIRO_ENABLE(symbol_lookup, symbol-lookup, auto, [
> PKG_CHECK_MODULES(glib, glib-2.0, have_glib=yes, have_glib=no)
> AC_SUBST(glib_CFLAGS)
> AC_SUBST(glib_LIBS)
>-AM_CONDITIONAL(BUILD_SPHINX, test "x$have_glib" = "xyes")
>+AM_CONDITIONAL(BUILD_SPHINX, test "x$have_glib" = "xyes" -a "x$have_windows" = "xno")
> 
> save_LIBS="$LIBS"
> AC_CHECK_LIB(rt, shm_open, shm_LIBS="-lrt")
>-- 
>1.8.1.1.439.g50a6b54
>

Actions: View | Splinter Review

Attachments on bug 63043: 77338

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.