From e8f155a144e85a06638304054e45491719a68e59 Mon Sep 17 00:00:00 2001 From: Julien Isorce Date: Tue, 12 May 2015 23:53:03 +0100 Subject: [PATCH 1/4] gallium/dri: fix duplicated symbols build error src/loader/Makefile.am already contains xmlconfig.c https://bugs.freedesktop.org/show_bug.cgi?id=90310 Signed-off-by: Julien Isorce --- src/gallium/targets/dri/Makefile.am | 6 ------ src/mesa/drivers/dri/common/Makefile.sources | 1 - 2 files changed, 7 deletions(-) diff --git a/src/gallium/targets/dri/Makefile.am b/src/gallium/targets/dri/Makefile.am index f9e4ada..9648396 100644 --- a/src/gallium/targets/dri/Makefile.am +++ b/src/gallium/targets/dri/Makefile.am @@ -53,12 +53,6 @@ gallium_dri_la_LIBADD = \ $(LIBDRM_LIBS) \ $(GALLIUM_COMMON_LIB_DEPS) -# 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 - EXTRA_gallium_dri_la_DEPENDENCIES = \ dri.sym \ $(top_srcdir)/src/gallium/targets/dri-vdpau.dyn diff --git a/src/mesa/drivers/dri/common/Makefile.sources b/src/mesa/drivers/dri/common/Makefile.sources index d00ec5f..91026e9 100644 --- a/src/mesa/drivers/dri/common/Makefile.sources +++ b/src/mesa/drivers/dri/common/Makefile.sources @@ -3,7 +3,6 @@ DRI_COMMON_FILES := \ utils.h \ dri_util.c \ dri_util.h \ - xmlconfig.c \ xmlconfig.h # Paths are relative to MESA_TOP. -- 1.9.5 (Apple Git-50.3)