OSDN Git Service

autotools: library-dependency when no sse and 32-bit
authorSergii Romantsov <sergii.romantsov@gmail.com>
Thu, 1 Nov 2018 11:02:43 +0000 (13:02 +0200)
committerEmil Velikov <emil.l.velikov@gmail.com>
Thu, 8 Nov 2018 16:05:38 +0000 (16:05 +0000)
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@pnwbakers.com>
CC: Lionel G Landwerlin <lionel.g.landwerlin@intel.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=108560
Signed-off-by: Sergii Romantsov <sergii.romantsov@globallogic.com>
Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
(cherry picked from commit ce837a537282f10bc48c4ac426fa9a31241beea2)

src/util/Makefile.am
src/util/meson.build

index b857db8..4bda54c 100644 (file)
@@ -60,7 +60,8 @@ libmesautil_la_LIBADD = \
        $(PTHREAD_LIBS) \
        $(CLOCK_LIB) \
        $(ZLIB_LIBS) \
-       $(LIBATOMIC_LIBS)
+       $(LIBATOMIC_LIBS) \
+       -lm
 
 libxmlconfig_la_SOURCES = $(XMLCONFIG_FILES)
 libxmlconfig_la_CFLAGS = \
index 7caea27..156621a 100644 (file)
@@ -119,7 +119,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
 )