Commit 5d425d33 authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

mesa3d: fix build



We build mesa3d with dri support, which doesn't work with static builds,
so disable it.

From configure.ac:

dri)
    # DRI must be shared, I think
    if test "$enable_static" = yes; then
        AC_MSG_ERROR([Can't use static libraries for DRI drivers])
    fi

At the same time fixup minor style issues (:= vs =, long lines).

Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 80a7e821
Loading
Loading
Loading
Loading
+21 −5
Original line number Diff line number Diff line
@@ -3,13 +3,29 @@
# mesa3d
#
#############################################################
MESA3D_VERSION:=7.6.1
MESA3D_SOURCE:=MesaLib-$(MESA3D_VERSION).tar.gz
MESA3D_SITE:=ftp://ftp.freedesktop.org/pub/mesa/$(MESA3D_VERSION)

MESA3D_CONF_OPT = --disable-egl --disable-glu --disable-glw --disable-glut --disable-gallium --with-driver=dri --with-dri-drivers=swrast
MESA3D_VERSION = 7.6.1
MESA3D_SOURCE = MesaLib-$(MESA3D_VERSION).tar.gz
MESA3D_SITE = ftp://ftp.freedesktop.org/pub/mesa/$(MESA3D_VERSION)
MESA3D_INSTALL_STAGING = YES

MESA3D_DEPENDENCIES = xproto_glproto xlib_libXxf86vm xlib_libXdamage xlib_libXfixes xproto_dri2proto libdrm expat
MESA3D_CONF_OPT = \
	--disable-egl \
	--disable-glu \
	--disable-glw \
	--disable-glut \
	--disable-gallium \
	--with-driver=dri \
	--with-dri-drivers=swrast \
	--disable-static

MESA3D_DEPENDENCIES = \
	xproto_glproto \
	xlib_libXxf86vm \
	xlib_libXdamage \
	xlib_libXfixes \
	xproto_dri2proto \
	libdrm \
	expat

$(eval $(call AUTOTARGETS))