[Mesa-dev] Mesa (master): configure.ac: don' t build gallium driver libs just to see if there are no errors

[Jon TURNEY]

On 14/07/2011 02:05, Marek Olšák wrote:
> Module: Mesa
> Branch: master
> Commit: 02c8ee202f5a159659a027deae4721ff05cd1530
> URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=02c8ee202f5a159659a027deae4721ff05cd1530
> 
> Author: Marek Olšák <maraeo at gmail.com>
> Date:   Mon Jun 27 08:02:31 2011 +0200
> 
> configure.ac: don't build gallium driver libs just to see if there are no errors
[snip]
> diff --git a/configure.ac b/configure.ac
> index a586f0a..c3047d6 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -769,7 +769,7 @@ GLU_DIRS="sgi"
>  GALLIUM_DIRS="auxiliary drivers state_trackers"
>  GALLIUM_TARGET_DIRS=""
>  GALLIUM_WINSYS_DIRS="sw"
> -GALLIUM_DRIVERS_DIRS="softpipe failover galahad trace rbug noop identity"
> +GALLIUM_DRIVERS_DIRS="failover galahad trace rbug noop identity"
>  GALLIUM_STATE_TRACKERS_DIRS=""
[snip]
>          xswrast)
>              if test "x$HAVE_ST_DRI" = xyes; then
> +                GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS softpipe"
> +                if test "x$MESA_LLVM" = x1; then
> +                    GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS llvmpipe"
> +                fi
>                  GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS dri-swrast"
>              fi
>              if test "x$HAVE_ST_VDPAU" = xyes; then

It looks like this changes (in the case where swrast is the only driver
selected) from always building softpipe to only building if the dri state
tracker is selected.

Since, this change, building with ./configure --with-driver=xlib
--with-gallium-drivers=swrast fails, see [1]

> mklib: Making CYGWIN shared library:  cygGL-1.dll
> Creating library file: libGL-1.dll.a
> xlib.o: In function `sw_screen_create_named':
> /opt/jhbuild/git/mesa/mesa/src/gallium/targets/libgl-xlib/../../../../src/gallium/auxiliary/target-helpers/inline_sw_helper.h:44: undefined reference to `_softpipe_create_screen'

inline_sw_helper.h conditionalizes the code which references softpipe on the
GALLIUM_SOFTPIPE define, but that is always set in
src/gallium/targets/libgl-xlib/Makefile without any reference to the
configuration.

I'd appreciate some guidance as to the correct way to fix this :-)

[1] http://tinderbox.freedesktop.org/builds/2011-07-17-0004/logs/libGL/#build