On 29/05/14 16:45, Jose Fonseca wrote: > I'm happy however you guys want to address this, as long as it builds. > > The only reason I added $(top_builddir)/src/loader/libloader.la was because > the autotools build was broken for almost a week. I don't care as much for > autotools build breakage as scons build breakage, but I still don't like to > see it broken. > The vast number of configure flags cause us to have this lovely experience :( Building with drm platform worked for me, so I did not see the issue until now.
I always keep an eye open for build breakage, although feel free to ping/cc me if I've missed something :) -Emil > Jose > > > ----- Original Message ----- >> On Wed, May 28, 2014 at 10:58 PM, Emil Velikov <emil.l.veli...@gmail.com> >> wrote: >>> With DRM_PLATFORM libloader.la in linked into libEGL pleading >>> to multiple defition of the loader* symbols. For every other >>> platform we need to explicitly link against it. >> I would prefer to see libloader.la removed from st/egl, and added to >> egl_gallium_la_LIBADD here when HAVE_EGL_PLATFORM_DRM. The idea is >> that we don't usually do LIBADD for state trackers, but rely on >> targets to do the right thing. >> >> >>> Bugzilla: >>> https://urldefense.proofpoint.com/v1/url?u=https://bugs.freedesktop.org/show_bug.cgi?id%3D79263&k=oIvRg1%2BdGAgOoM1BIlLLqw%3D%3D%0A&r=NMr9uy2iTjWVixC0wOcYCWEIYhfo80qKwRgdodpoDzA%3D%0A&m=3dDDaM1y2lGalSv1W9TO0xa6X%2FalOUjK0G6lPEmYiVs%3D%0A&s=a5e924fedf8798d6828e4c662f03b41bec73db248e91a648e3b2f6003003bd09 >>> Cc: José Fonseca <jfons...@vmware.com> >>> Cc: Chia-I Wu <o...@lunarg.com> >>> Signed-off-by: Emil Velikov <emil.l.veli...@gmail.com> >>> --- >>> src/gallium/targets/egl-static/Makefile.am | 4 +++- >>> 1 file changed, 3 insertions(+), 1 deletion(-) >>> >>> diff --git a/src/gallium/targets/egl-static/Makefile.am >>> b/src/gallium/targets/egl-static/Makefile.am >>> index f4990ad..224ed95 100644 >>> --- a/src/gallium/targets/egl-static/Makefile.am >>> +++ b/src/gallium/targets/egl-static/Makefile.am >>> @@ -66,7 +66,6 @@ egl_gallium_la_SOURCES = \ >>> egl_st.c >>> >>> egl_gallium_la_LIBADD = \ >>> - $(top_builddir)/src/loader/libloader.la \ >>> $(top_builddir)/src/gallium/auxiliary/libgallium.la \ >>> $(top_builddir)/src/gallium/drivers/identity/libidentity.la \ >>> $(top_builddir)/src/gallium/drivers/trace/libtrace.la \ >>> @@ -100,6 +99,9 @@ AM_CPPFLAGS += $(LIBDRM_CFLAGS) >>> egl_gallium_la_LIBADD += \ >>> $(top_builddir)/src/gbm/libgbm.la \ >>> $(LIBDRM_LIBS) >>> +else >>> +egl_gallium_la_LIBADD += \ >>> + $(top_builddir)/src/loader/libloader.la >>> endif >>> >>> if HAVE_EGL_PLATFORM_FBDEV >>> -- >>> 1.9.3 >>> >> >> >> >> -- >> o...@lunarg.com >> _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
