OSDN Git Service

mesa: build xmlconfig to a separate static library
authorErik Faye-Lund <kusmabite@gmail.com>
Wed, 10 Jun 2015 22:35:04 +0000 (23:35 +0100)
committerEmil Velikov <emil.l.velikov@gmail.com>
Thu, 18 Jun 2015 12:43:40 +0000 (13:43 +0100)
commit20fd2abdd6dce03db7ad79375ddfc27b4b4926dc
tree31cf17ee7a0c79dafbf9916fa7ef32af5a90c89f
parentbb00457f49177d8d43417855f843887de3148e99
mesa: build xmlconfig to a separate static library

As we use the file from both the dri modules and loader, we end up with
multiple definition of the symbols provided in our gallium dri  modules.
Additionally we compile the file twice.

Resolve both issues, effectively enabling the build on toolchains which
don't support -Wl,--allow-multiple-definition.

v2: [Emil Velikov]
 - Fix the Scons/Android build.
 - Resolve libgbm build issues (bring back the missing -lm)

Cc: Julien Isorce <j.isorce@samsung.com>
Cc: "10.5 10.6" <mesa-stable@lists.freedesktop.org>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=90310
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=90905
Acked-by: Matt Turner <mattst88@gmail.com>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
(cherry picked from commit 634f2002563b4fca68490c0a39518ea838f28fb1)
src/gallium/targets/dri/Makefile.am
src/loader/Makefile.am
src/mesa/drivers/dri/Makefile.am
src/mesa/drivers/dri/common/Android.mk
src/mesa/drivers/dri/common/Makefile.am
src/mesa/drivers/dri/common/Makefile.sources
src/mesa/drivers/dri/common/SConscript
src/mesa/drivers/dri/i965/Makefile.am