From: Sergii Romantsov <sergii.romantsov@gmail.com>
Date: Fri, 7 Sep 2018 09:43:41 +0000 (+0300)
Subject: mesa/meson: 32bit xmlconfig linkage
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=bbe551f3eab793a18cd427098cf8563040c0b56f;p=mesa.git

mesa/meson: 32bit xmlconfig linkage

Building of 32bit mesa with meson causes linkage issue:
"undefined reference to `util_get_process_name'"
Fixed by adding link-with mesa_util for xmlconfig primary.

v2: Removed '[]', commit message corrected.

v3: Reverted changes in gbm and glx libraries.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=107843
Fixes: 2e1e6511f76370870b5cd "util: extract get_process_name from xmlconfig.c"
Cc: Marek Olšák <marek.olsak@amd.com>
Cc: Dylan Baker <dylan@pnwbakers.com>
Signed-off-by: Sergii Romantsov <sergii.romantsov@globallogic.com>
Reviewed-by: Eric Engestrom <eric.engestrom@intel.com>
Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
---

diff --git a/src/util/meson.build b/src/util/meson.build
index e7ad2861238..027bc5b9d0d 100644
--- a/src/util/meson.build
+++ b/src/util/meson.build
@@ -119,6 +119,7 @@ libxmlconfig = static_library(
   'xmlconfig',
   files_xmlconfig,
   include_directories : inc_common,
+  link_with : libmesa_util,
   dependencies : [dep_expat, dep_m],
   c_args : [
     c_msvc_compat_args, c_vis_args,