diff options
| author | Erik Faye-Lund <kusmabite@gmail.com> | 2015-06-10 23:35:04 +0100 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2015-06-12 15:32:18 +0100 |
| commit | 634f2002563b4fca68490c0a39518ea838f28fb1 (patch) | |
| tree | 8e64647bd1347bcd64a7915de6b7eb08397cfdd8 /src/loader | |
| parent | 83b5648a1e0b7c21536af18c0d29da2f2a31215e (diff) | |
| download | external_mesa3d-634f2002563b4fca68490c0a39518ea838f28fb1.zip external_mesa3d-634f2002563b4fca68490c0a39518ea838f28fb1.tar.gz external_mesa3d-634f2002563b4fca68490c0a39518ea838f28fb1.tar.bz2 | |
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>
Diffstat (limited to 'src/loader')
| -rw-r--r-- | src/loader/Makefile.am | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/loader/Makefile.am b/src/loader/Makefile.am index 36ddba8..aef1bd6 100644 --- a/src/loader/Makefile.am +++ b/src/loader/Makefile.am @@ -41,15 +41,11 @@ libloader_la_CPPFLAGS += \ -I$(top_builddir)/src/mesa/drivers/dri/common/ \ -I$(top_srcdir)/src/mesa/ \ -I$(top_srcdir)/src/mapi/ \ - -DUSE_DRICONF \ - $(EXPAT_CFLAGS) + -DUSE_DRICONF -libloader_la_SOURCES += \ - $(top_srcdir)/src/mesa/drivers/dri/common/xmlconfig.c + libloader_la_LIBADD += \ + $(top_builddir)/src/mesa/drivers/dri/common/libxmlconfig.la -libloader_la_LIBADD += \ - -lm \ - $(EXPAT_LIBS) endif if !HAVE_LIBDRM |