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

Auke Kok auke at foo-projects.org
Wed May 2 18:27:31 CEST 2012


On 05/02/2012 04:22 AM, Zbigniew Luszpinski wrote:
> commit 182abc4fabc91617483d1bf15e3f5b3f5d86bb6b
> Author: Zbigniew Luszpinski<zbiggy at lunar-linux.org>
> Date:   Wed May 2 13:22:14 2012 +0200
>
>      mesa-lib: small fixes
> ---
>   xorg7/mesa-lib/BUILD |    6 +++---
>   1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/xorg7/mesa-lib/BUILD b/xorg7/mesa-lib/BUILD
> index 95751e9..b5f88db 100644
> --- a/xorg7/mesa-lib/BUILD
> +++ b/xorg7/mesa-lib/BUILD
> @@ -31,14 +31,14 @@
>       if module_installed libva; then
>          OPTS+=" --enable-va"
>       fi
> -    if [[ -n $SUPPORTED_GALLIUM ]]; then
> +    if [[ -n $GALLIUMDRIVER ]]; then
>       OPTS+=" --with-gallium-drivers=swrast,"
> -    OPTS+=$(echo $SUPPORTED_GALLIUM | sed s/\ /,/g)
> +    OPTS+=$(echo $GALLIUMDRIVER | sed s/\ /,/g)
>       fi
>     else OPTS+=" --disable-gallium-llvm "
>     fi&&
>
> -  if [[ $MESADRIVER == *r[36]00* ]]; then lin -c llvm
> +  if [[ $GALLIUMDRIVER == *r[36]00* ]]; then lin -c llvm
>     else sedit 's/^GALLIUM_DRIVERS_DEFAULT=.*/GALLIUM_DRIVERS_DEFAULT="swrast"/' configure
>     fi&&

You can't run `lin` from a BUILD file.... that's going to break stuff 
down the road. The environment is polluted enough to make that a nightmare.

Better to error out with an error message if llvm isn't installed at 
that point.

Calling `lin` is only allowed (and I'm not happy with the current state 
of how it even works internally) from POST_INSTALL.

Auke


More information about the Lunar-dev mailing list