From: Dylan Baker <dylan@pnwbakers.com>
Date: Wed, 27 Sep 2017 18:30:21 +0000 (-0700)
Subject: meson: look for libelf as a library if there is no pkgconfig
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=cc4f5873071f0cbea0dcea78359e5144ee1908e6;p=mesa.git

meson: look for libelf as a library if there is no pkgconfig

Required for older versions of libelf that don't have a pkgconfig file.

Signed-off-by: Dylan Baker <dylanx.c.baker@intel.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
---

diff --git a/meson.build b/meson.build
index ecd08651ff0..b1bd73691ee 100644
--- a/meson.build
+++ b/meson.build
@@ -286,7 +286,10 @@ endif
 dep_zlib = dependency('zlib', version : '>= 1.2.3')
 dep_thread = dependency('threads')
 pre_args += '-DHAVE_PTHREAD'
-dep_elf = dependency('libelf')
+dep_elf = dependency('libelf', required : false)
+if not dep_elf.found()
+  dep_elf = cc.find_library('elf')
+endif
 dep_expat = dependency('expat')
 # this only exists on linux so either this is linux and it will be found, or
 # its not linux and and wont