From 4fe3ce2aa3410a7787881db9ad729d6248b61c67 Mon Sep 17 00:00:00 2001
From: Sergii Romantsov <sergii.romantsov@gmail.com>
Date: Fri, 7 Sep 2018 12:43:41 +0300
Subject: [PATCH] mesa/meson: 32bit xmlconfig linkage
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
(cherry picked from commit bbe551f3eab793a18cd427098cf8563040c0b56f)
---
 src/util/meson.build | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/util/meson.build b/src/util/meson.build
index 6386d945a22..1f98758aa46 100644
--- a/src/util/meson.build
+++ b/src/util/meson.build
@@ -117,6 +117,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,