[Mesa-stable] [PATCH 4/4] egl-static: Only export necessary symbols v3

Tom Stellard tom at stellard.net
Mon Nov 11 14:28:36 PST 2013


From: Tom Stellard <thomas.stellard at amd.com>

This fixes a crash in glamor when mesa links against static LLVM.

v2:
  - Inline LINKER_SCRIPT variable

v3: Kai Wasserbäch
  - Fix out out-of-tree-builds

Tested-by: Kai Wasserbäch <kai at dev.carbon-project.or>
---
 src/gallium/targets/egl-static/Makefile.am | 2 ++
 src/gallium/targets/egl-static/egl.link    | 3 +++
 2 files changed, 5 insertions(+)
 create mode 100644 src/gallium/targets/egl-static/egl.link

diff --git a/src/gallium/targets/egl-static/Makefile.am b/src/gallium/targets/egl-static/Makefile.am
index 0b30aeb..760c477 100644
--- a/src/gallium/targets/egl-static/Makefile.am
+++ b/src/gallium/targets/egl-static/Makefile.am
@@ -30,6 +30,8 @@
 #
 include $(top_srcdir)/src/gallium/Automake.inc
 
+LDFLAGS += -Wl,$(top_srcdir)/src/gallium/targets/egl-static/egl.link
+
 AM_CFLAGS = $(PTHREAD_CFLAGS)
 AM_CPPFLAGS = \
 	$(GALLIUM_CFLAGS) \
diff --git a/src/gallium/targets/egl-static/egl.link b/src/gallium/targets/egl-static/egl.link
new file mode 100644
index 0000000..78d155d
--- /dev/null
+++ b/src/gallium/targets/egl-static/egl.link
@@ -0,0 +1,3 @@
+VERSION {
+{ global: _eglMain; local: *; };
+};
-- 
1.8.1.5



More information about the mesa-stable mailing list