Mesa (13.0): mapi: automake: set VISIBILITY_CFLAGS for shared glapi

Emil Velikov evelikov at kemper.freedesktop.org
Mon Oct 24 11:24:43 UTC 2016


Module: Mesa
Branch: 13.0
Commit: af81cdfec045f9e175edd5b5e8fcaa9e91f0dd38
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=af81cdfec045f9e175edd5b5e8fcaa9e91f0dd38

Author: Jonathan Gray <jsg at jsg.id.au>
Date:   Sat Oct 22 18:19:53 2016 +1100

mapi: automake: set VISIBILITY_CFLAGS for shared glapi

shared glapi was previously built without setting CFLAGS for
AM_CFLAGS and VISIBILITY_CFLAGS.

This resulted in symbols being exported that shouldn't be.

The x86 and sparc assembly versions of the dispatch table partially
mitigated this by using .hidden.  Otherwise shared_dispatch_stub_*
were being exported.

Signed-off-by: Jonathan Gray <jsg at jsg.id.au>
Cc: "11.2 12.0 13.0" <mesa-stable at lists.freedesktop.org>
Reviewed-by: Emil Velikov <emil.velikov at collabora.com>
Reviewed-by: Eric Engestrom <eric.engestrom at imgtec.com>

---

 src/mapi/Makefile.am | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/mapi/Makefile.am b/src/mapi/Makefile.am
index 46afe3b..5013e9a 100644
--- a/src/mapi/Makefile.am
+++ b/src/mapi/Makefile.am
@@ -64,6 +64,9 @@ BUILT_SOURCES += shared-glapi/glapi_mapi_tmp.h
 
 lib_LTLIBRARIES += shared-glapi/libglapi.la
 shared_glapi_libglapi_la_SOURCES = $(MAPI_GLAPI_FILES) shared-glapi/glapi_mapi_tmp.h
+shared_glapi_libglapi_la_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(VISIBILITY_CFLAGS)
 shared_glapi_libglapi_la_CPPFLAGS = \
 	$(AM_CPPFLAGS) \
 	-DMAPI_MODE_GLAPI \




More information about the mesa-commit mailing list