Attachment 81547 Details for Bug 64959 – Don't include X11 headers if no X11 platform

[patch] Don't include X11 headers if no X11 platform

0001-build-fix-EGL-build-when-no-X11-headers-are-present.patch (text/plain), 1.38 KB, created by Ross Burton on 2013-06-27 11:35:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ross Burton

Created: 2013-06-27 11:35:45 UTC

Size: 1.38 KB

patch

obsolete

>From 0eea26f2c2b4144a7050f479e62eeae26068d86c Mon Sep 17 00:00:00 2001
>From: Ross Burton <ross.burton@intel.com>
>Date: Thu, 27 Jun 2013 11:43:41 +0100
>Subject: [PATCH 1/2] build: fix EGL build when no X11 headers are present
>
>eglplatform.h defaults to X11 on Unix unless told otherwise, so if we're doing a
>build without any X11 support tell it so that we don't try including headers
>that don't exist.
>
>Also set GL_PC_FLAGS so that the definition is in egl.pl, so that applications
>using EGL don't try to pull in X11 headers on systems where EGL was configured
>without X11 support.
>
>Signed-off-by: Ross Burton <ross.burton@intel.com>
>
>https://bugs.freedesktop.org/show_bug.cgi?id=64959
>---
> configure.ac |    7 +++++++
> 1 file changed, 7 insertions(+)
>
>diff --git a/configure.ac b/configure.ac
>index 6832b0d..3a0cd77 100644
>--- a/configure.ac
>+++ b/configure.ac
>@@ -1490,6 +1490,13 @@ AC_SUBST([EGL_NATIVE_PLATFORM])
> AC_SUBST([EGL_PLATFORMS])
> AC_SUBST([EGL_CFLAGS])
> 
>+# If we don't have the X11 platform, set this define so we don't try to include
>+# the X11 headers.
>+if ! echo "$egl_platforms" | grep -q 'x11'; then
>+    DEFINES="$DEFINES -DMESA_EGL_NO_X11_HEADERS"
>+    GL_PC_CFLAGS="$GL_PC_CFLAGS -DMESA_EGL_NO_X11_HEADERS"
>+fi
>+
> AC_ARG_WITH([egl-driver-dir],
>     [AS_HELP_STRING([--with-egl-driver-dir=DIR],
>                     [directory for EGL drivers [[default=${libdir}/egl]]])],
>-- 
>1.7.10.4
>

Actions: View | Splinter Review

Attachments on bug 64959: 81544 | 81545 | 81547 | 81548

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.