[Mesa-dev] [PATCH] osmesa: link against static libglapi library too to get the gl exports

[Maarten Lankhorst]

Can anyone else test if this fixes the bug on their machine? It appears to fix it on mine..
It seems the shared part is needed for the driver interface, and the static part to pick up
the exports correctly.

8<--------------
Appears to fix https://bugs.freedesktop.org/show_bug.cgi?id=47824 for me.

This is a candidate for the stable series.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst at canonical.com>
---
--- a/src/mesa/drivers/osmesa/Makefile.am
+++ b/src/mesa/drivers/osmesa/Makefile.am
@@ -40,11 +40,11 @@ lib_LTLIBRARIES = lib at OSMESA_LIB@.la
 
 lib at OSMESA_LIB@_la_LDFLAGS = -module -version-number @OSMESA_VERSION@ -no-undefined
 
-if HAVE_SHARED_GLAPI
-GLAPI_LIB = $(top_builddir)/src/mapi/shared-glapi/libglapi.la
-else
 GLAPI_LIB = $(top_builddir)/src/mapi/glapi/libglapi.la
+if HAVE_SHARED_GLAPI
+GLAPI_LIB += $(top_builddir)/src/mapi/shared-glapi/libglapi.la
 endif
+
 lib at OSMESA_LIB@_la_LIBADD = \
 	$(top_builddir)/src/mesa/libmesa.la \
 	$(GLAPI_LIB) \