[Mesa-dev] [PATCH] meson: fix egl build for meson version < 0.43

[Vinson Lee]

On Fri, Oct 20, 2017 at 5:34 PM, Dylan Baker <dylan at pnwbakers.com> wrote:
> Meson 0.43 added the ability to pass nested lists to
> include_directories, so the code that we have works for 0.43, but not
> for 0.42. This patch changes the include_directories list to be flat so
> it works with 0.42
>
> fixes: 108d257a16859898f5c ("meson: build libEGL")
> Signed-off-by: Dylan Baker <dylanx.c.baker at intel.com>
> ---
>  src/egl/meson.build | 9 ++++-----
>  1 file changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/src/egl/meson.build b/src/egl/meson.build
> index 8ea8a5bbb69..ea7ae06761f 100644
> --- a/src/egl/meson.build
> +++ b/src/egl/meson.build
> @@ -21,7 +21,9 @@
>  c_args_for_egl = []
>  link_for_egl = []
>  deps_for_egl = []
> -incs_for_egl = []
> +incs_for_egl = [
> +  inc_include, inc_src, inc_loader, inc_gbm, include_directories('main'),
> +]
>  files_egl = files(
>    'main/eglapi.c',
>    'main/eglapi.h',
> @@ -159,10 +161,7 @@ libegl = shared_library(
>      '-D_EGL_BUILT_IN_DRIVER_DRI2',
>      '-D_EGL_NATIVE_PLATFORM=_EGL_PLATFORM_ at 0@'.format(egl_native_platform.to_upper()),
>    ],
> -  include_directories : [
> -    incs_for_egl, inc_include, inc_src, inc_loader, inc_gbm,
> -    include_directories('main'),
> -  ],
> +  include_directories : incs_for_egl,
>    link_with : [link_for_egl, libloader, libxmlconfig, libglapi, libmesa_util],
>    link_args : [ld_args_bsymbolic, ld_args_gc_sections],
>    dependencies : [deps_for_egl, dep_dl, dep_libdrm, dep_clock, dep_thread],
> --
> 2.14.2
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev


Tested-by: Vinson Lee <vlee at freedesktop.org>