On 07/10/13 12:05, Marek Olšák wrote: > From: Marek Olšák <[email protected]> > > which contains -Wl,-Bsymbolic. If I understand it correctly, it prevents > symbols from clashing if multiple drivers are loaded at the same time. A small side note,
This and the original commit handling the classic dri drivers, cause some extra (cosmetic or perhaps buggy) autoconf/automake warnings alike: 'i965.la' is not a standard libtool library name did you mean `libi965.la'? At the very early stage for parsing the Makefile.am files, DRI_DRIVER_LDFLAGS is undefined and -module missing from the LDFLAGS, leading to the above message(s). I've been using this change with nouveau for a while now with no side effects. FWIW Tested-by: Emil Velikov <[email protected]> Cheers Emil > --- > src/gallium/targets/dri-freedreno/Makefile.am | 2 +- > src/gallium/targets/dri-i915/Makefile.am | 2 +- > src/gallium/targets/dri-ilo/Makefile.am | 2 +- > src/gallium/targets/dri-nouveau/Makefile.am | 2 +- > src/gallium/targets/dri-swrast/Makefile.am | 2 +- > src/gallium/targets/dri-vmwgfx/Makefile.am | 2 +- > src/gallium/targets/r300/dri/Makefile.am | 2 +- > src/gallium/targets/r600/dri/Makefile.am | 2 +- > src/gallium/targets/radeonsi/dri/Makefile.am | 2 +- > 9 files changed, 9 insertions(+), 9 deletions(-) > > diff --git a/src/gallium/targets/dri-freedreno/Makefile.am > b/src/gallium/targets/dri-freedreno/Makefile.am > index ac7460a..228fafc 100644 > --- a/src/gallium/targets/dri-freedreno/Makefile.am > +++ b/src/gallium/targets/dri-freedreno/Makefile.am > @@ -39,7 +39,7 @@ AM_CPPFLAGS = \ > dridir = $(DRI_DRIVER_INSTALL_DIR) > dri_LTLIBRARIES = kgsl_dri.la msm_dri.la > > -COMMON_LDFLAGS = -module -avoid-version -shared -no-undefined > +COMMON_LDFLAGS = $(DRI_DRIVER_LDFLAGS) > > COMMON_LIBADD = \ > $(top_builddir)/src/mesa/drivers/dri/common/libdricommon.la \ > diff --git a/src/gallium/targets/dri-i915/Makefile.am > b/src/gallium/targets/dri-i915/Makefile.am > index e1c6eca..851c412 100644 > --- a/src/gallium/targets/dri-i915/Makefile.am > +++ b/src/gallium/targets/dri-i915/Makefile.am > @@ -42,7 +42,7 @@ dri_LTLIBRARIES = i915_dri.la > > i915_dri_la_SOURCES = target.c > > -i915_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined > +i915_dri_la_LDFLAGS = $(DRI_DRIVER_LDFLAGS) > > i915_dri_la_LIBADD = \ > $(top_builddir)/src/mesa/drivers/dri/common/libdricommon.la \ > diff --git a/src/gallium/targets/dri-ilo/Makefile.am > b/src/gallium/targets/dri-ilo/Makefile.am > index 88233f6..776c970 100644 > --- a/src/gallium/targets/dri-ilo/Makefile.am > +++ b/src/gallium/targets/dri-ilo/Makefile.am > @@ -42,7 +42,7 @@ noinst_LTLIBRARIES = ilo_dri.la > ilo_dri_la_SOURCES = target.c > > # need -rpath to create a noinst shared library > -ilo_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined \ > +ilo_dri_la_LDFLAGS = $(DRI_DRIVER_LDFLAGS) \ > -rpath $(abs_builddir) > > ilo_dri_la_LIBADD = \ > diff --git a/src/gallium/targets/dri-nouveau/Makefile.am > b/src/gallium/targets/dri-nouveau/Makefile.am > index a02394e..17b2c4a 100644 > --- a/src/gallium/targets/dri-nouveau/Makefile.am > +++ b/src/gallium/targets/dri-nouveau/Makefile.am > @@ -41,7 +41,7 @@ dri_LTLIBRARIES = nouveau_dri.la > nodist_EXTRA_nouveau_dri_la_SOURCES = dummy.cpp > nouveau_dri_la_SOURCES = target.c > > -nouveau_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined > +nouveau_dri_la_LDFLAGS = $(DRI_DRIVER_LDFLAGS) > > nouveau_dri_la_LIBADD = \ > $(top_builddir)/src/mesa/drivers/dri/common/libdricommon.la \ > diff --git a/src/gallium/targets/dri-swrast/Makefile.am > b/src/gallium/targets/dri-swrast/Makefile.am > index 1104379..8b98836 100644 > --- a/src/gallium/targets/dri-swrast/Makefile.am > +++ b/src/gallium/targets/dri-swrast/Makefile.am > @@ -46,7 +46,7 @@ swrast_dri_la_SOURCES = \ > $(top_srcdir)/src/mesa/drivers/dri/common/drisw_util.c \ > $(top_srcdir)/src/mesa/drivers/dri/common/xmlconfig.c > > -swrast_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined > +swrast_dri_la_LDFLAGS = $(DRI_DRIVER_LDFLAGS) > > swrast_dri_la_LIBADD = \ > $(top_builddir)/src/mesa/libmesagallium.la \ > diff --git a/src/gallium/targets/dri-vmwgfx/Makefile.am > b/src/gallium/targets/dri-vmwgfx/Makefile.am > index f7008ab..5ff521e 100644 > --- a/src/gallium/targets/dri-vmwgfx/Makefile.am > +++ b/src/gallium/targets/dri-vmwgfx/Makefile.am > @@ -42,7 +42,7 @@ vmwgfx_dri_la_SOURCES = \ > target.c \ > vmw_powf.c > > -vmwgfx_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined > +vmwgfx_dri_la_LDFLAGS = $(DRI_DRIVER_LDFLAGS) > > vmwgfx_dri_la_LIBADD = \ > $(top_builddir)/src/mesa/drivers/dri/common/libdricommon.la \ > diff --git a/src/gallium/targets/r300/dri/Makefile.am > b/src/gallium/targets/r300/dri/Makefile.am > index 5e49ab5..5e9b5c3 100644 > --- a/src/gallium/targets/r300/dri/Makefile.am > +++ b/src/gallium/targets/r300/dri/Makefile.am > @@ -43,7 +43,7 @@ nodist_EXTRA_r300_dri_la_SOURCES = dummy.cpp > r300_dri_la_SOURCES = \ > ../drm_target.c > > -r300_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined > +r300_dri_la_LDFLAGS = $(DRI_DRIVER_LDFLAGS) > > r300_dri_la_LIBADD = \ > $(top_builddir)/src/mesa/drivers/dri/common/libdricommon.la \ > diff --git a/src/gallium/targets/r600/dri/Makefile.am > b/src/gallium/targets/r600/dri/Makefile.am > index 5a1600c..8f4d7f7 100644 > --- a/src/gallium/targets/r600/dri/Makefile.am > +++ b/src/gallium/targets/r600/dri/Makefile.am > @@ -42,7 +42,7 @@ dri_LTLIBRARIES = r600_dri.la > r600_dri_la_SOURCES = \ > ../drm_target.c > > -r600_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined > +r600_dri_la_LDFLAGS = $(DRI_DRIVER_LDFLAGS) > > r600_dri_la_LIBADD = \ > $(top_builddir)/src/mesa/drivers/dri/common/libdricommon.la \ > diff --git a/src/gallium/targets/radeonsi/dri/Makefile.am > b/src/gallium/targets/radeonsi/dri/Makefile.am > index 257574c..23313c3 100644 > --- a/src/gallium/targets/radeonsi/dri/Makefile.am > +++ b/src/gallium/targets/radeonsi/dri/Makefile.am > @@ -43,7 +43,7 @@ nodist_EXTRA_radeonsi_dri_la_SOURCES = dummy.cpp > radeonsi_dri_la_SOURCES = \ > ../drm_target.c > > -radeonsi_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined > +radeonsi_dri_la_LDFLAGS = $(DRI_DRIVER_LDFLAGS) > > radeonsi_dri_la_LIBADD = \ > $(top_builddir)/src/mesa/drivers/dri/common/libdricommon.la \ > _______________________________________________ mesa-dev mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-dev
