[Mesa-dev] failed to compile mesa

[CSJ]

Hi, Dan

This patch works with
./autogen.sh --prefix="$PREFIX" --enable-xcb --with-dri-drivers=i915
--disable-gallium --without-demos

if I use
./autogen.sh --prefix="$PREFIX" --enable-xcb --with-dri-drivers=i915
--disable-gallium
it failed as attached with-demos.log.

if I use
./autogen.sh --prefix="$PREFIX" --enable-xcb --without-dri-drivers
--enable-gallium-intel
it failed as attach intel-gallium-enabled.log

Thanks.

2010/4/19 Dan Nicholson <dbn.lists at gmail.com>

> On Mon, Apr 19, 2010 at 12:15:22AM +0800, CSJ wrote:
> > Sorry I am not familiar with Makefiles
> > But I modified src/egl/drivers/glx/Makefile and
> > src/egl/main/Makefile as attached patch file.
> >
> > and it can compiled passed when configured
> > --with-dri-drivers=i915 --disable-gallium --without-demos
> >
> > if gallium enabled or with demos, it still compiled failed that
> > can not find xlib.h
> >
> > I'll temporarily use this patch to go on compile xserver,
> > thanks all :)
>
> Can you try the patch below? This is what I'd like to commit since we
> already have the x11.pc values.
>
> --
> Dan
>
> From 520bbf586f8089f21092a9577bc0c0f9f89e8dd3 Mon Sep 17 00:00:00 2001
> From: Dan Nicholson <dbn.lists at gmail.com>
> Date: Sun, 18 Apr 2010 09:33:03 -0700
> Subject: [PATCH] egl: Pass flags to locate Xlib headers and libraries
>
> eglplatform.h pulls in Xlib.h on X11 platforms. Likewise, the egl glx
> driver needs to link to libX11. Make sure we use the locations the user
> told us about.
>
> Signed-off-by: Dan Nicholson <dbn.lists at gmail.com>
> ---
>  src/egl/drivers/glx/Makefile |    4 ++--
>  src/egl/main/Makefile        |    2 +-
>  2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/src/egl/drivers/glx/Makefile b/src/egl/drivers/glx/Makefile
> index 634638f..d976b91 100644
> --- a/src/egl/drivers/glx/Makefile
> +++ b/src/egl/drivers/glx/Makefile
> @@ -10,7 +10,7 @@ EGL_INCLUDES = \
>        -I$(TOP)/include \
>        -I$(TOP)/src/egl/main
>
> -EGL_CFLAGS =
> -EGL_LIBS = -lX11 -lGL
> +EGL_CFLAGS = $(X11_CFLAGS)
> +EGL_LIBS = $(X11_LIBS) -lGL
>
>  include ../Makefile.template
> diff --git a/src/egl/main/Makefile b/src/egl/main/Makefile
> index 31f214c..3b4ebf7 100644
> --- a/src/egl/main/Makefile
> +++ b/src/egl/main/Makefile
> @@ -7,7 +7,7 @@ include $(TOP)/configs/current
>  EGL_MAJOR = 1
>  EGL_MINOR = 0
>
> -INCLUDE_DIRS = -I$(TOP)/include
> +INCLUDE_DIRS = -I$(TOP)/include $(X11_CFLAGS)
>
>  HEADERS = \
>        eglcompiler.h \
> --
> 1.6.6.1
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/mesa-dev/attachments/20100419/c892ae18/attachment.html>