[Mesa-dev] [PATCH mesa] travis: install correct version of mako for each build system

[Dylan Baker]

Reviewed-by: Dylan Baker <dylan at pnwbakers.com>

Quoting Eric Engestrom (2018-08-13 04:15:06)
> Meson now uses python3, so let's add a block for Autotools, move that
> line into the buildsys-specific blocks, and set the correct version for
> Meson.
> 
> Fixes: 2ee1c86d71bee5ddca2c "meson: Build with Python 3"
> Signed-off-by: Eric Engestrom <eric.engestrom at intel.com>
> ---
>  .travis.yml | 9 +++++++--
>  1 file changed, 7 insertions(+), 2 deletions(-)
> 
> diff --git a/.travis.yml b/.travis.yml
> index 430c159c9c5c946280a4..32cd8602e6f06a97f37b 100644
> --- a/.travis.yml
> +++ b/.travis.yml
> @@ -493,18 +493,23 @@ before_install:
>      fi
>  
>  install:
> -  - pip2 install --user mako
> -
>    # Install a more modern meson from pip, since the version in the
>    # ubuntu repos is often quite old. Avoid >=0.45.0 as it needs python
>    # 3.5+
>    - if test "x$BUILD" = xmeson; then
>        pip3 install --user "meson<0.45.0";
> +      pip3 install --user mako;
> +    fi
> +
> +  # Install autotools build dependencies
> +  - if test "x$BUILD" = xmake; then
> +      pip2 install --user mako;
>      fi
>  
>    # Install a more modern scons from pip.
>    - if test "x$BUILD" = xscons; then
>        pip2 install --user "scons>=2.4";
> +      pip2 install --user mako;
>      fi
>  
>    # Since libdrm gets updated in configure.ac regularly, try to pick up the
> -- 
> Cheers,
>   Eric
> 
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 228 bytes
Desc: signature
URL: <https://lists.freedesktop.org/archives/mesa-dev/attachments/20180814/0bd76d01/attachment.sig>