<div dir="ltr">On 20 October 2017 at 20:34, Dylan Baker <span dir="ltr"><<a href="mailto:dylan@pnwbakers.com" target="_blank">dylan@pnwbakers.com</a>></span> wrote:<br><div class="gmail_extra"><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">Meson 0.43 added the ability to pass nested lists to<br>
include_directories, so the code that we have works for 0.43, but not<br>
for 0.42. This patch changes the include_directories list to be flat so<br>
it works with 0.42<br>
<br>
fixes: 108d257a16859898f5c ("meson: build libEGL")<br>
Signed-off-by: Dylan Baker <<a href="mailto:dylanx.c.baker@intel.com">dylanx.c.baker@intel.com</a>><br>
---<br>
src/egl/meson.build | 9 ++++-----<br>
1 file changed, 4 insertions(+), 5 deletions(-)<br>
<br>
diff --git a/src/egl/meson.build b/src/egl/meson.build<br>
index 8ea8a5bbb69..ea7ae06761f 100644<br>
--- a/src/egl/meson.build<br>
+++ b/src/egl/meson.build<br>
@@ -21,7 +21,9 @@<br>
c_args_for_egl = []<br>
link_for_egl = []<br>
deps_for_egl = []<br>
-incs_for_egl = []<br>
+incs_for_egl = [<br>
+ inc_include, inc_src, inc_loader, inc_gbm, include_directories('main'),<br>
+]<br>
files_egl = files(<br>
'main/eglapi.c',<br>
'main/eglapi.h',<br>
@@ -159,10 +161,7 @@ libegl = shared_library(<br>
'-D_EGL_BUILT_IN_DRIVER_DRI2',<br>
'-D_EGL_NATIVE_PLATFORM=_EGL_<wbr>PLATFORM_@0@'.format(egl_<wbr>native_platform.to_upper()),<br>
],<br>
- include_directories : [<br>
- incs_for_egl, inc_include, inc_src, inc_loader, inc_gbm,<br>
- include_directories('main'),<br>
- ],<br>
+ include_directories : incs_for_egl,<br>
link_with : [link_for_egl, libloader, libxmlconfig, libglapi, libmesa_util],<br>
link_args : [ld_args_bsymbolic, ld_args_gc_sections],<br>
dependencies : [deps_for_egl, dep_dl, dep_libdrm, dep_clock, dep_thread],<br>
<span class="gmail-HOEnZb"><font color="#888888">--<br>
2.14.2<br>
<br>
______________________________<wbr>_________________<br>
mesa-dev mailing list<br>
<a href="mailto:mesa-dev@lists.freedesktop.org">mesa-dev@lists.freedesktop.org</a><br>
<a href="https://lists.freedesktop.org/mailman/listinfo/mesa-dev" rel="noreferrer" target="_blank">https://lists.freedesktop.org/<wbr>mailman/listinfo/mesa-dev</a><br></font></span></blockquote><div><br></div><div><span class="gmail-il">Reviewed</span>-<span class="gmail-il">by</span>: Rhys Kidd <<a href="mailto:rhyskidd@gmail.com" target="_blank">rhyskidd@gmail.com</a>> <br></div></div><br></div></div>