Mesa (master): meson: Don't use expat on windows

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 4441da00448df0700e4424900091ebbdaa6a3c4f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=4441da00448df0700e4424900091ebbdaa6a3c4f

Author: Dylan Baker <dylan at pnwbakers.com>
Date:   Fri Oct 11 09:19:25 2019 -0700

meson: Don't use expat on windows

It's not really needed, and there's no debian package for it so we're
forced to fall back to wraps in mesa's CI. This can be problematic in
itself.

Reviewed-by: Eric Engestrom <eric.engestrom at intel.com>

---

 meson.build | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index e65dcf482aa..ac52833f417 100644
--- a/meson.build
+++ b/meson.build
@@ -1265,7 +1265,11 @@ if dep_thread.found() and host_machine.system() != 'windows'
     pre_args += '-DPTHREAD_SETAFFINITY_IN_NP_HEADER'
   endif
 endif
-dep_expat = dependency('expat', fallback : ['expat', 'expat_dep'])
+if host_machine.system() != 'windows'
+  dep_expat = dependency('expat', fallback : ['expat', 'expat_dep'])
+else
+  dep_expat = null_dep
+endif
 # this only exists on linux so either this is linux and it will be found, or
 # it's not linux and wont
 dep_m = cc.find_library('m', required : false)