Mesa (master): meson: if dep_dl is an empty list, it' s not a dependency object

Jon TURNEY jturney at kemper.freedesktop.org
Tue Nov 14 12:01:45 UTC 2017


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

Author: Jon Turney <jon.turney at dronecode.org.uk>
Date:   Mon Nov 13 10:13:54 2017 +0000

meson: if dep_dl is an empty list, it's not a dependency object

It's ok to use an empty list for dependencies:, but it's not ok to try to
use the found() method of it.

See also https://github.com/mesonbuild/meson/issues/2324

Signed-off-by: Jon Turney <jon.turney at dronecode.org.uk>
Reviewed-by: Eric Engestrom <eric.engestrom at imgtec.com>
Reviewed-by: Dylan Baker <dylan at pnwbakers.com>

---

 meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index e8467590df..1c4200705f 100644
--- a/meson.build
+++ b/meson.build
@@ -922,7 +922,7 @@ endif
 if dep_m.found()
   gl_priv_libs += '-lm'
 endif
-if dep_dl.found()
+if dep_dl != [] and dep_dl.found()
   gl_priv_libs += '-ldl'
 endif
 




More information about the mesa-commit mailing list