From ce837a537282f10bc48c4ac426fa9a31241beea2 Mon Sep 17 00:00:00 2001 From: Sergii Romantsov Date: Thu, 1 Nov 2018 13:02:43 +0200 Subject: [PATCH] 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 CC: Lionel G Landwerlin Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=108560 Signed-off-by: Sergii Romantsov Reviewed-by: Dylan Baker --- 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 b857db8a866..4bda54c551d 100644 --- a/src/util/Makefile.am +++ b/src/util/Makefile.am @@ -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 = \ diff --git a/src/util/meson.build b/src/util/meson.build index 7caea27d660..156621aff65 100644 --- a/src/util/meson.build +++ b/src/util/meson.build @@ -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 ) -- 2.30.2