[Mesa-dev] [PATCH 2/2] egl: automake: don't link against libmesautil

[Emil Velikov]

From: Emil Velikov <emil.velikov at collabora.com>

Originally required for the u_vector implementation, which was inlined
in u_vector.h with previous commit.

Using libmesautil pulled the C++ runtime (string_to_uint_map.cpp),
which is something don't want to impose in our libEGL.

We could consider rewriting string_to_uint_map in C, but that's too
invasive for a stable fix.

Cc: Daniel Stone <daniels at collabora.com>
Cc: "17.2" <mesa-stable at lists.freedesktop.org>
Fixes: 02cc35937277 ("egl/wayland: Use linux-dmabuf interface for buffers")
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=101851
Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
---
 src/egl/Makefile.am | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/egl/Makefile.am b/src/egl/Makefile.am
index bb8ec9745dd..7331b616a8d 100644
--- a/src/egl/Makefile.am
+++ b/src/egl/Makefile.am
@@ -82,7 +82,6 @@ AM_CFLAGS += $(WAYLAND_CFLAGS)
 libEGL_common_la_LIBADD += $(WAYLAND_LIBS)
 libEGL_common_la_LIBADD += $(LIBDRM_LIBS)
 libEGL_common_la_LIBADD += $(top_builddir)/src/egl/wayland/wayland-drm/libwayland-drm.la
-libEGL_common_la_LIBADD += $(top_builddir)/src/util/libmesautil.la
 dri2_backend_FILES += \
 	drivers/dri2/platform_wayland.c	\
 	drivers/dri2/linux-dmabuf-unstable-v1-protocol.c \
-- 
2.13.3