blob: 33c5c7d54e3de39598a6de35826d714591aebb46 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
|
From b03b3cd46dc9e7d8f1d1ec2f6222aaed6fa289ff Mon Sep 17 00:00:00 2001
From: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sat, 30 Nov 2013 16:39:51 +0000
Subject: [PATCH 1/3] gallium/targets/dri: explicitly link against glapi, use
-no-undefined
On Cygwin we need to link against the static or shared glapi provider so it can
be built with no unresolved references.
"Use -no-undefined to assure libtool that the library has no unresolved symbols
at link time, so that libtool will build a shared library on platforms that
require that all symbols are resolved when the library is linked."
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
---
src/gallium/targets/dri/Makefile.am | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/src/gallium/targets/dri/Makefile.am b/src/gallium/targets/dri/Makefile.am
index e61df81228..1276c46088 100644
--- a/src/gallium/targets/dri/Makefile.am
+++ b/src/gallium/targets/dri/Makefile.am
@@ -22,6 +22,7 @@ nodist_EXTRA_gallium_dri_la_SOURCES = dummy.cpp
gallium_dri_la_SOURCES =
gallium_dri_la_LDFLAGS = \
+ -no-undefined \
-shared \
-shrext .so \
-module \
@@ -57,6 +58,12 @@ gallium_dri_la_LIBADD = \
$(LIBDRM_LIBS) \
$(GALLIUM_COMMON_LIB_DEPS)
+if HAVE_SHARED_GLAPI
+gallium_dri_la_LIBADD += $(top_builddir)/src/mapi/shared-glapi/libglapi.la
+else
+gallium_dri_la_LIBADD += $(top_builddir)/src/mapi/glapi/libglapi.la
+endif
+
EXTRA_gallium_dri_la_DEPENDENCIES = \
dri.sym \
$(top_srcdir)/src/gallium/targets/dri-vdpau.dyn
--
2.12.3
|
