Mesa (staging/18.2): autotools: library-dependency when no sse and 32-bit

[GitLab Mirror]

Module: Mesa
Branch: staging/18.2
Commit: ff85e527e07af5ac785f12251fbb364d0241ccb6
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ff85e527e07af5ac785f12251fbb364d0241ccb6

Author: Sergii Romantsov <sergii.romantsov at gmail.com>
Date:   Thu Nov  1 13:02:43 2018 +0200

autotools: library-dependency when no sse and 32-bit

Building of 32bit Mesa may fail if __SSE__ is not specified.
Added missed dependency from libm.

v2: avoided dependecy on any flag, just link

v3: meson doesn't fail, but have added dependency on libm

CC: Dylan Baker <dylan at pnwbakers.com>
CC: Lionel G Landwerlin <lionel.g.landwerlin at intel.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=108560
Signed-off-by: Sergii Romantsov <sergii.romantsov at globallogic.com>
Reviewed-by: Dylan Baker <dylan at pnwbakers.com>
(cherry picked from commit ce837a537282f10bc48c4ac426fa9a31241beea2)

---

 src/util/Makefile.am | 3 ++-
 src/util/meson.build | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index bafb57439a..1e14308337 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -59,7 +59,8 @@ libmesautil_la_LIBADD = \
 	$(PTHREAD_LIBS) \
 	$(CLOCK_LIB) \
 	$(ZLIB_LIBS) \
-	$(LIBATOMIC_LIBS)
+	$(LIBATOMIC_LIBS) \
+	-lm
 
 libxmlconfig_la_SOURCES = $(XMLCONFIG_FILES)
 libxmlconfig_la_CFLAGS = \
diff --git a/src/util/meson.build b/src/util/meson.build
index 1f98758aa4..795b5fdf24 100644
--- a/src/util/meson.build
+++ b/src/util/meson.build
@@ -108,7 +108,7 @@ libmesa_util = static_library(
   'mesa_util',
   [files_mesa_util, format_srgb],
   include_directories : inc_common,
-  dependencies : [dep_zlib, dep_clock, dep_thread, dep_atomic],
+  dependencies : [dep_zlib, dep_clock, dep_thread, dep_atomic, dep_m],
   c_args : [c_msvc_compat_args, c_vis_args],
   build_by_default : false
 )