[PATCH] egl: Link wayland-drm.a into libEGL after egl_dri2

[Kristian Høgsberg]

On Wed, May 18, 2011 at 2:59 PM, Thierry Reding
<thierry.reding at avionic-design.de> wrote:
> Fixes the following build error in wayland-demos:
>
>          CCLD   wayland-compositor
>        /usr/lib/libEGL.so: undefined reference to `wayland_drm_buffer_get_buffer'
>        /usr/lib/libEGL.so: undefined reference to `wayland_drm_uninit'
>        /usr/lib/libEGL.so: undefined reference to `wayland_buffer_is_drm'
>        /usr/lib/libEGL.so: undefined reference to `wayland_drm_init'
>        /usr/lib/libEGL.so: undefined reference to `wl_drm_interface'

Thanks.  I did fix this locally but was a little slow to push it.
It's upstream now.

Kristian

>  src/egl/main/Makefile |    8 ++++----
>  1 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/src/egl/main/Makefile b/src/egl/main/Makefile
> index 6c24255..6c4a392 100644
> --- a/src/egl/main/Makefile
> +++ b/src/egl/main/Makefile
> @@ -54,10 +54,6 @@ OBJECTS = $(SOURCES:.c=.o)
>  LOCAL_CFLAGS = -D_EGL_OS_UNIX=1
>  LOCAL_LIBS =
>
> -ifneq ($(findstring wayland, $(EGL_PLATFORMS)),)
> -LOCAL_LIBS += $(TOP)/src/egl/wayland/wayland-drm/libwayland-drm.a
> -endif
> -
>  # egl_dri2 and egl_glx are built-ins
>  ifeq ($(filter dri2, $(EGL_DRIVERS_DIRS)),dri2)
>  LOCAL_CFLAGS += -D_EGL_BUILT_IN_DRIVER_DRI2
> @@ -68,6 +64,10 @@ endif
>  EGL_LIB_DEPS += $(LIBUDEV_LIBS) $(DLOPEN_LIBS) $(LIBDRM_LIB) $(WAYLAND_LIBS)
>  endif
>
> +ifneq ($(findstring wayland, $(EGL_PLATFORMS)),)
> +LOCAL_LIBS += $(TOP)/src/egl/wayland/wayland-drm/libwayland-drm.a
> +endif
> +
>  ifeq ($(filter glx, $(EGL_DRIVERS_DIRS)),glx)
>  LOCAL_CFLAGS += -D_EGL_BUILT_IN_DRIVER_GLX
>  LOCAL_LIBS += $(TOP)/src/egl/drivers/glx/libegl_glx.a
> --
> 1.7.5.1
>
> _______________________________________________
> wayland-devel mailing list
> wayland-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/wayland-devel
>