Mesa (master): targets/dri: allow duplicated symbols

[Emil Velikov]

Module: Mesa
Branch: master
Commit: 7414552b1826ece48a622c14b48cad3a37b68025
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7414552b1826ece48a622c14b48cad3a37b68025

Author: Emil Velikov <emil.l.velikov at gmail.com>
Date:   Wed Jul  2 12:06:41 2014 +0100

targets/dri: allow duplicated symbols

With the inclusion of xmlconfig in the loader we're providing dri* symbols
which are already available in libdricommon.la. This leads to a build
break due to the multiple definitions.

Temporary allow multiple definitions, until we come with a better solution.

Reported-by: Laurent Carlier <lordheavym at gmail.com>
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>

---

 src/gallium/targets/dri/Makefile.am |    6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/gallium/targets/dri/Makefile.am b/src/gallium/targets/dri/Makefile.am
index 88242a9..cb12064 100644
--- a/src/gallium/targets/dri/Makefile.am
+++ b/src/gallium/targets/dri/Makefile.am
@@ -45,6 +45,12 @@ gallium_dri_la_LIBADD = \
 
 if HAVE_GALLIUM_STATIC_TARGETS
 
+# XXX: Temporary allow duplicated symbols, as the loader pulls in xmlconfig.c
+# which already provides driParse* and driQuery* amongst others.
+# Remove this hack as we come up with a cleaner solution.
+gallium_dri_la_LDFLAGS += \
+	-Wl,--allow-multiple-definition
+
 MEGADRIVERS =
 STATIC_TARGET_CPPFLAGS =
 STATIC_TARGET_LIB_DEPS = \