From 51accecce7755be9b7eb1baadaec7e4b7d1011af Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Thu, 13 Apr 2017 19:36:56 +0100 Subject: [PATCH] mesa/dri: always link against shared glapi MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Analogous to previous commit. Check with the extensive commit description and bug report referenced. Cc: mesa-stable@lists.freedesktop.org Signed-off-by: Emil Velikov Reviewed-by: Nicolai Hähnle --- src/mesa/drivers/dri/Makefile.am | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/mesa/drivers/dri/Makefile.am b/src/mesa/drivers/dri/Makefile.am index 1c6dd08a85d..fb0fc3258bf 100644 --- a/src/mesa/drivers/dri/Makefile.am +++ b/src/mesa/drivers/dri/Makefile.am @@ -6,12 +6,9 @@ MEGADRIVERS_DEPS = SUBDIRS+=common -# On Android, we need to explicitly link to libglapi.so. -if HAVE_ANDROID if HAVE_SHARED_GLAPI SHARED_GLAPI_LIB = $(top_builddir)/src/mapi/shared-glapi/libglapi.la endif -endif if HAVE_I915_DRI SUBDIRS += i915 @@ -59,10 +56,15 @@ driinclude_HEADERS = \ nodist_EXTRA_mesa_dri_drivers_la_SOURCES = dummy.cpp mesa_dri_drivers_la_SOURCES = mesa_dri_drivers_la_LDFLAGS = \ - -module -avoid-version -shared -shrext .so \ - $(BSYMBOLIC) \ - $(GC_SECTIONS) \ - $() + -shared \ + -shrext .so \ + -module \ + -no-undefined \ + -avoid-version \ + $(BSYMBOLIC) \ + $(GC_SECTIONS) \ + $(LD_NO_UNDEFINED) + mesa_dri_drivers_la_LIBADD = \ ../../libmesa.la \ common/libmegadriver_stub.la \ -- 2.30.2