[Mesa-dev] [PATCH] st/egl: do not link against libloader

[Chia-I Wu]

On Thu, May 29, 2014 at 10:43 AM, Emil Velikov <emil.l.velikov at gmail.com> wrote:
> Move the link to the final targets, like any other place in
> mesa/gallium. This allows better visibilty and will prevent
> us from including the library archive twice.
>
> Resolves multiple definition of `loader_get_pci_id_for_fd'
Thanks for working on this.  This patch is

Reviewed-by: Chia-I Wu <olv at lunarg.com>

> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=79263
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=79382
> Cc: Chia-I Wu <olv at lunarg.com>
> Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
> ---
>
> Strange... I could swear I did remove that one a while back.
> Either way, perhaps I should pay closer attention to the
> messages the build throws at us next time.
>
> -Emil
>
>  src/gallium/state_trackers/egl/Makefile.am | 1 -
>  1 file changed, 1 deletion(-)
>
> diff --git a/src/gallium/state_trackers/egl/Makefile.am b/src/gallium/state_trackers/egl/Makefile.am
> index 26266ed..b7dcdab 100644
> --- a/src/gallium/state_trackers/egl/Makefile.am
> +++ b/src/gallium/state_trackers/egl/Makefile.am
> @@ -65,7 +65,6 @@ endif
>
>  if HAVE_EGL_PLATFORM_DRM
>  libegl_la_SOURCES += $(drm_FILES)
> -libegl_la_LIBADD = $(top_builddir)/src/loader/libloader.la
>  AM_CFLAGS += \
>         $(LIBDRM_CFLAGS)
>  AM_CPPFLAGS += \
> --
> 1.9.3
>



-- 
olv at LunarG.com