From 7414552b1826ece48a622c14b48cad3a37b68025 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Wed, 2 Jul 2014 12:06:41 +0100 Subject: [PATCH] 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 Signed-off-by: Emil Velikov --- 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 = \ -- 2.7.4