---
With all my patches applied automake build succeeds with:
./autogen.sh --host=x86_64-suse-linux-gnu --build=x86_64-suse-linux-gnu
--program-prefix= --prefix=/usr --exec-prefix=/usr --bindir=/usr/bin
--sbindir=/usr/sbin --sysconfdir=/etc --datadir=/usr/share
--includedir=/usr/include --libdir=/usr/lib64 --libexecdir=/usr/lib
--localstatedir=/var --sharedstatedir=/usr/com --mandir=/usr/share/man
--infodir=/usr/share/info --disable-dependency-tracking --enable-xvmc
--enable-vdpau --enable-texture-float --enable-debug
--with-dri-drivers=i915,i965,nouveau,r200,radeon,swrast
--with-gallium-drivers=i915,nouveau,r300,r600,radeonsi,svga,swrast --enable-dri
--enable-glx --enable-osmesa --enable-gles1 --enable-gles2 --enable-openvg
--enable-shared-glapi --enable-shared-gallium --enable-gbm --enable-xa
--enable-gallium-egl --enable-gallium-llvm --enable-gallium-gbm --enable-opencl
--enable-r600-llvm-compiler --enable-gallium-g3dvl --enable-glx-tls
Actually I should call it:
"Make all perfect."
---
src/gallium/targets/egl-static/Makefile.am | 16 ++++++++--------
1 Datei geändert, 8 Zeilen hinzugefügt(+), 8 Zeilen entfernt(-)
diff --git a/src/gallium/targets/egl-static/Makefile.am
b/src/gallium/targets/egl-static/Makefile.am
index bbd2592..a306ec8 100644
--- a/src/gallium/targets/egl-static/Makefile.am
+++ b/src/gallium/targets/egl-static/Makefile.am
@@ -43,7 +43,7 @@ egl_gallium_la_LIBADD = \
$(PTHREAD_LIBS) \
-lm
-egl_gallium_la_LDFLAGS = -no-undefined -avoid-version -module
+egl_gallium_la_LDFLAGS = -no-undefined -Wl,--allow-multiple-definition
-avoid-version -module
if HAVE_EGL_PLATFORM_X11
AM_CPPFLAGS += $(LIBDRM_CFLAGS)
@@ -134,24 +134,24 @@ endif
if HAVE_GALLIUM_R300
AM_CPPFLAGS += -D_EGL_PIPE_R300=1
egl_gallium_la_LIBADD += \
- $(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la \
- $(top_builddir)/src/gallium/drivers/r300/libr300.la \
- $(RADEON_LIBS)
+ $(top_builddir)/src/gallium/drivers/r300/libr300.la
endif
if HAVE_GALLIUM_R600
AM_CPPFLAGS += -D_EGL_PIPE_R600=1
egl_gallium_la_LIBADD += \
- $(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la \
- $(top_builddir)/src/gallium/drivers/r600/libr600.la \
- $(RADEON_LIBS)
+ $(top_builddir)/src/gallium/drivers/r600/libr600.la
endif
if HAVE_GALLIUM_RADEONSI
AM_CPPFLAGS += -D_EGL_PIPE_RADEONSI=1
egl_gallium_la_LIBADD += \
+ $(top_builddir)/src/gallium/drivers/radeonsi/libradeonsi.la
+endif
+
+if NEED_RADEON_GALLIUM
+egl_gallium_la_LIBADD += \
$(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la \
- $(top_builddir)/src/gallium/drivers/radeonsi/libradeonsi.la \
$(RADEON_LIBS)
endif
--
1.7.10.4
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
