projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8df5815)
mapi: automake: set VISIBILITY_CFLAGS for shared glapi
authorJonathan Gray <jsg@jsg.id.au>
Sat, 22 Oct 2016 07:19:53 +0000 (18:19 +1100)
committerEmil Velikov <emil.l.velikov@gmail.com>
Mon, 24 Oct 2016 10:29:23 +0000 (11:29 +0100)
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@jsg.id.au>
Cc: "11.2 12.0 13.0" <mesa-stable@lists.freedesktop.org>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
src/mapi/Makefile.am patch | blob | history

diff --git a/src/mapi/Makefile.am b/src/mapi/Makefile.am
index 46afe3bae60859ac871e5da4704eae5c5e1ba4ed..5013e9af5e1452f08761eaff659529db549bb986 100644 (file)
--- 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
 
 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 \
 shared_glapi_libglapi_la_CPPFLAGS = \
        $(AM_CPPFLAGS) \
        -DMAPI_MODE_GLAPI \