[Lunar-commits] <moonbase> mesa-lib: build fixes

[samuel]

typical...

Zbiggy touches a module that was building perfectly fine... now it now
longer builds...

SIGH

On Tue, May 17, 2011 at 12:06 AM, Zbigniew Luszpinski
<zbiggy at lunar-linux.org> wrote:
> commit 96e80e2f231343fcdb7e7aa33a7f140c6a29f272
> Author: Zbigniew Luszpinski <zbiggy at lunar-linux.org>
> Date:   Tue May 17 00:06:15 2011 +0200
>
>    mesa-lib: build fixes
> ---
>  xorg7/mesa-lib/BUILD     |   25 +++++++++++--------------
>  xorg7/mesa-lib/CONFIGURE |    3 ++-
>  2 files changed, 13 insertions(+), 15 deletions(-)
>
> diff --git a/xorg7/mesa-lib/BUILD b/xorg7/mesa-lib/BUILD
> index ac4ffc4..845c9f5 100644
> --- a/xorg7/mesa-lib/BUILD
> +++ b/xorg7/mesa-lib/BUILD
> @@ -1,9 +1,5 @@
>  (
>
> -  # mesa merges cflags and ldflags then complains that ldflags are unknown to gcc
> -  # turn off linker till solution will be found
> -  bad_flags linker &&
> -
>   if [[ -n $MESADRIVER ]] ; then
>     # Build selected drivers only, rather than the default of all of them
>     # Ensure that swrast is included, as a fall-back
> @@ -11,26 +7,27 @@
>     OPTS+=$(echo $MESADRIVER | sed s/\ /,/g)
>     OPTS+=" --enable-gallium-swrast --enable-gallium-llvm "
>     if [[ $MESADRIVER == *i915* ]]; then
> -      OPTS+="--enable-gallium-i915 "
> +      OPTS+=" --enable-gallium-i915 "
>     fi
>     if [[ $MESADRIVER == *i965* ]]; then
> -      OPTS+="--enable-gallium-i965 "
> -    fi
> -    if [[ $MESADRIVER == *nouveau* ]]; then
> -      OPTS+="--enable-gallium-nouveau "
> +      OPTS+=" --enable-gallium-i965 "
>     fi
> +# Nouveau breaks build in mesa 7.10.2
> +#    if [[ $MESADRIVER == *nouveau* ]]; then
> +#      OPTS+=" --enable-gallium-nouveau "
> +#    fi
>     if [[ $MESADRIVER == *radeon* ]]; then
> -      OPTS+="--enable-gallium-radeon "
> +      OPTS+=" --enable-gallium-radeon "
>     fi
>     if [[ $MESADRIVER == *r600* ]]; then
> -      OPTS+="--enable-gallium-r600 "
> +      OPTS+=" --enable-gallium-r600 "
>     fi
>   fi  &&
>
>   # Detect VMware VGA virtual 3D card and add driver for it
> -  VGA=`lspci | grep 'VGA.*VMware.*SVGA.*'` &&
> -  if [[ $VGA == *VMware* ]];then
> -     OPTS+="--enable-gallium-svga "
> +  VGA=`lspci | grep 'VGA.*VMware.*SVGA.*'`
> +  if [[ $VGA == *VMware* ]]; then
> +     OPTS+=" --enable-gallium-svga "
>   fi &&
>
>   # Don't overlap with freeglut
> diff --git a/xorg7/mesa-lib/CONFIGURE b/xorg7/mesa-lib/CONFIGURE
> index 458f18e..1fb388e 100644
> --- a/xorg7/mesa-lib/CONFIGURE
> +++ b/xorg7/mesa-lib/CONFIGURE
> @@ -1,5 +1,6 @@
>  # swrast is always included, in BUILD
> -SUPPORTED_DRIVERS="i810 i915 i965 mach64 mga r128 r200 r300 r600 radeon nouveau savage sis tdfx unichrome"
> +# nouveau is removed from the list because it fails to build
> +SUPPORTED_DRIVERS="i810 i915 i965 mach64 mga r128 r200 r300 r600 radeon savage sis tdfx unichrome"
>
>  make_drivers_checklist() {
>
> _______________________________________________
> Lunar-commits mailing list
> Lunar-commits at lunar-linux.org
> http://foo-projects.org/mailman/listinfo/lunar-commits
>